Commit 1beb3191 by Abseil Team Committed by Gennadiy Rozental

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
parent 1b7e751e
......@@ -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>
......
......@@ -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
......
......@@ -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 = [
......
......@@ -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":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment