From eeaeaaeb1617c40aa535d5ccd00c4edd05bea2df Mon Sep 17 00:00:00 2001
From: Mark Overholser <m@Ferguson.as-local>
Date: Sun, 23 Feb 2025 16:23:31 -0600
Subject: [PATCH] fix to_count in zeek.bif to resolve conflict from bbanier's
 adjustment to static casting of the return from strtoull

---
 src/zeek.bif | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zeek.bif b/src/zeek.bif
index af5dbee259..bce9efe005 100644
--- a/src/zeek.bif
+++ b/src/zeek.bif
@@ -2680,7 +2680,7 @@ function to_count%(str: string, base: count &default=10%): count
 	const char* s = str->CheckString();
 	char* end_s;
 
-	uint64_t u = (uint64_t) strtoull(s, &end_s, base);
+	uint64_t u = static_cast<uint64_t> strtoull(s, &end_s, base);
 
 	if ( s[0] == '\0' || end_s[0] != '\0' )
     	{