commit 76bb24329e8bf5f39704eb10d21b9a80befa7c81
author Derek Mauro <761129+derekmauro@users.noreply.github.com> Tue Jun 17 10:48:08 2025 -0400
committer GitHub <noreply@github.com> Tue Jun 17 10:48:08 2025 -0400
tree 5ddcda4d2a13641f9e161eeb9a3321820b9f1052
parent bc257a88f7c1939f24e0379f14a3589e926c950c

Abseil LTS Branch, May 2025, Patch 1 (#1900)

Fix conditional constexpr in ToInt64{Nano|Micro|Milli}seconds
under GCC7 and GCC8 using an else clause as a workaround

Fix -Wundef warning

MODULE.bazel

diff --git a/MODULE.bazel b/MODULE.bazel
index 10fc31b..48a65c7 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -16,7 +16,7 @@
 
 module(
     name = "abseil-cpp",
-    version = "20250512.0",
+    version = "20250512.1",
     compatibility_level = 1,
 )
 

absl/base/config.h

diff --git a/absl/base/config.h b/absl/base/config.h
index 9170a6f..1a9bc59 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -118,7 +118,7 @@
 // LTS releases can be obtained from
 // https://github.com/abseil/abseil-cpp/releases.
 #define ABSL_LTS_RELEASE_VERSION 20250512
-#define ABSL_LTS_RELEASE_PATCH_LEVEL 0
+#define ABSL_LTS_RELEASE_PATCH_LEVEL 1
 
 // Helper macro to convert a CPP variable to a string literal.
 #define ABSL_INTERNAL_DO_TOKEN_STR(x) #x

absl/hash/internal/hash.h

diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h
index 63b3549..eb53823 100644
--- a/absl/hash/internal/hash.h
+++ b/absl/hash/internal/hash.h
@@ -39,7 +39,7 @@
 
 // For feature testing and determining which headers can be included.
 #if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L || \
-    ABSL_INTERNAL_VERSION_HEADER_AVAILABLE
+    defined(ABSL_INTERNAL_VERSION_HEADER_AVAILABLE)
 #include <version>
 #else
 #include <ciso646>

absl/time/time.h

diff --git a/absl/time/time.h b/absl/time/time.h
index db17a4c..53bca90 100644
--- a/absl/time/time.h
+++ b/absl/time/time.h
@@ -1869,8 +1869,9 @@
       time_internal::GetRepHi(d) >> 33 == 0) {
     return (time_internal::GetRepHi(d) * 1000 * 1000 * 1000) +
            (time_internal::GetRepLo(d) / time_internal::kTicksPerNanosecond);
+  } else {
+    return d / Nanoseconds(1);
   }
-  return d / Nanoseconds(1);
 }
 
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Microseconds(
@@ -1880,8 +1881,9 @@
     return (time_internal::GetRepHi(d) * 1000 * 1000) +
            (time_internal::GetRepLo(d) /
             (time_internal::kTicksPerNanosecond * 1000));
+  } else {
+    return d / Microseconds(1);
   }
-  return d / Microseconds(1);
 }
 
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Milliseconds(
@@ -1891,8 +1893,9 @@
     return (time_internal::GetRepHi(d) * 1000) +
            (time_internal::GetRepLo(d) /
             (time_internal::kTicksPerNanosecond * 1000 * 1000));
+  } else {
+    return d / Milliseconds(1);
   }
-  return d / Milliseconds(1);
 }
 
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Seconds(Duration d) {