Export of internal Abseil changes

-- 240f86077dabaa58210e6b1a35cc442902409bf5 by Gennadiy Rozental <[email protected]>: Fix the link to the Allocator concept description. PiperOrigin-RevId: 326292363 -- d023337da5c7c23ec5f316c4e03efc4d8404ad63 by Gennadiy Rozental <[email protected]>: Add -DNOMINMAX to gcc/clang build command line in case they are used to build Abseil on Windows. Fixes abseil#761 PiperOrigin-RevId: 326255039 GitOrigin-RevId: 240f86077dabaa58210e6b1a35cc442902409bf5 Change-Id: If8a40a9b2be9c0c1e652347e2f22e2fff6bbeaa1
skerche88 · Aug 13, 2020 · 1beb319 · 1beb319
1 parent 1b7e751
commit 1beb319
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/absl/container/internal/raw_hash_set.h b/absl/container/internal/raw_hash_set.h
@@ -523,7 +523,8 @@ inline void AssertIsValid(ctrl_t* ctrl) {
 // if they are equal, false if they are not. If two keys compare equal, then
 // their hash values as defined by Hash MUST be equal.
 //
-// Allocator: an Allocator [https://devdocs.io/cpp/concept/allocator] with which
+// Allocator: an Allocator
+// [https://en.cppreference.com/w/cpp/named_req/Allocator] with which
 // the storage of the hashtable will be allocated and the elements will be
 // constructed and destroyed.
 template <class Policy, class Hash, class Eq, class Alloc>

diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
@@ -89,6 +89,7 @@ list(APPEND ABSL_GCC_FLAGS
     "-Wwrite-strings"
     "-Wno-missing-field-initializers"
     "-Wno-sign-compare"
+    "-DNOMINMAX"
 )
 
 list(APPEND ABSL_GCC_TEST_FLAGS
@@ -146,6 +147,7 @@ list(APPEND ABSL_LLVM_FLAGS
     "-Wobjc-literal-conversion"
     "-Wno-sign-conversion"
     "-Wstring-conversion"
+    "-DNOMINMAX"
 )
 
 list(APPEND ABSL_LLVM_TEST_FLAGS

diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
@@ -90,6 +90,7 @@ ABSL_GCC_FLAGS = [
     "-Wwrite-strings",
     "-Wno-missing-field-initializers",
     "-Wno-sign-compare",
+    "-DNOMINMAX",
 ]
 
 ABSL_GCC_TEST_FLAGS = [
@@ -147,6 +148,7 @@ ABSL_LLVM_FLAGS = [
     "-Wobjc-literal-conversion",
     "-Wno-sign-conversion",
     "-Wstring-conversion",
+    "-DNOMINMAX",
 ]
 
 ABSL_LLVM_TEST_FLAGS = [

diff --git a/absl/copts/copts.py b/absl/copts/copts.py
@@ -141,6 +141,8 @@
         # Google style does not use unsigned integers, though STL containers
         # have unsigned types.
         "-Wno-sign-compare",
+        # Don't define min and max macros (Build on Windows using gcc)
+        "-DNOMINMAX",
     ],
     "ABSL_GCC_TEST_FLAGS": [
         "-Wno-conversion-null",
@@ -152,7 +154,10 @@
         "-Wno-unused-private-field",
     ],
     "ABSL_LLVM_FLAGS":
-        LLVM_BIG_WARNING_FLAGS + LLVM_DISABLE_WARNINGS_FLAGS,
+        LLVM_BIG_WARNING_FLAGS + LLVM_DISABLE_WARNINGS_FLAGS + [
+            # Don't define min and max macros (Build on Windows using clang)
+            "-DNOMINMAX",
+        ],
     "ABSL_LLVM_TEST_FLAGS":
         LLVM_TEST_DISABLE_WARNINGS_FLAGS,
     "ABSL_CLANG_CL_FLAGS":