summaryrefslogtreecommitdiff
path: root/absl
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2020-08-12 12:53:19 -0700
committerGravatar Gennadiy Rozental <rogeeff@google.com>2020-08-13 02:18:53 -0400
commit1beb3191c20ea315186dc761540d25c4939f1892 (patch)
tree196e93118dfa96b18e74a38ad973cc7454a501e2 /absl
parent1b7e751e58ce7d40ac7d1ffd944a8e6928994dfa (diff)
Export of internal Abseil changes
-- 240f86077dabaa58210e6b1a35cc442902409bf5 by Gennadiy Rozental <rogeeff@google.com>: Fix the link to the Allocator concept description. PiperOrigin-RevId: 326292363 -- d023337da5c7c23ec5f316c4e03efc4d8404ad63 by Gennadiy Rozental <rogeeff@google.com>: Add -DNOMINMAX to gcc/clang build command line in case they are used to build Abseil on Windows. Fixes #761 PiperOrigin-RevId: 326255039 GitOrigin-RevId: 240f86077dabaa58210e6b1a35cc442902409bf5 Change-Id: If8a40a9b2be9c0c1e652347e2f22e2fff6bbeaa1
Diffstat (limited to 'absl')
-rw-r--r--absl/container/internal/raw_hash_set.h3
-rw-r--r--absl/copts/GENERATED_AbseilCopts.cmake2
-rw-r--r--absl/copts/GENERATED_copts.bzl2
-rw-r--r--absl/copts/copts.py7
4 files changed, 12 insertions, 2 deletions
diff --git a/absl/container/internal/raw_hash_set.h b/absl/container/internal/raw_hash_set.h
index 1f304b61..48a1a8c6 100644
--- 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
index 935eb6db..97bd283e 100644
--- 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
index dad5b285..bcdd61ef 100644
--- 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
index 7c3edb64..a3437c1b 100644
--- a/absl/copts/copts.py
+++ b/absl/copts/copts.py
@@ -141,6 +141,8 @@ COPT_VARS = {
# 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 @@ COPT_VARS = {
"-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":