summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2019-08-27 09:03:36 -0700
committerGravatar Eric Fiselier <eric@efcs.ca>2019-08-27 13:29:28 -0400
commita0d1e098c2f99694fa399b175a7ccf920762030e (patch)
tree7b1ed4e83ce331acd4bc725052d2c63bcbd310f1
parent2d2d7fbc283315b676159716376e739d3d23ed94 (diff)
Export of internal Abseil changes
-- f685906f54727cc2d356787af410ef72ddd38bd0 by Derek Mauro <dmauro@google.com>: On Windows, compile with /bigobj. Some template heavy code requires this. PiperOrigin-RevId: 265695531 -- ed808812a4f5915d0516cecdc24ef4b90cf8333e by Derek Mauro <dmauro@google.com>: Fix the btree_test build on Windows+CMake PiperOrigin-RevId: 265689993 -- c9a8ade28d7537d1dceec19c74edc4b10daf3c91 by Abseil Team <absl-team@google.com>: Remove unused using ::test::IsEmpty. PiperOrigin-RevId: 265567080 GitOrigin-RevId: f685906f54727cc2d356787af410ef72ddd38bd0 Change-Id: I12a3c9ef41c1b7c4c5f075a1ad4cedad54e953ac
-rw-r--r--absl/container/CMakeLists.txt4
-rw-r--r--absl/container/btree_test.cc1
-rw-r--r--absl/copts/GENERATED_AbseilCopts.cmake1
-rw-r--r--absl/copts/GENERATED_copts.bzl1
-rw-r--r--absl/copts/copts.py2
5 files changed, 8 insertions, 1 deletions
diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
index a6912220..111cc783 100644
--- a/absl/container/CMakeLists.txt
+++ b/absl/container/CMakeLists.txt
@@ -71,6 +71,10 @@ absl_cc_test(
btree_test
SRCS
"btree_test.cc"
+ COPTS
+ ${ABSL_TEST_COPTS}
+ LINKOPTS
+ ${ABSL_DEFAULT_LINKOPTS}
DEPS
absl::btree
absl::btree_test_common
diff --git a/absl/container/btree_test.cc b/absl/container/btree_test.cc
index d213ee61..4edb2775 100644
--- a/absl/container/btree_test.cc
+++ b/absl/container/btree_test.cc
@@ -49,7 +49,6 @@ using ::absl::test_internal::InstanceTracker;
using ::absl::test_internal::MovableOnlyInstance;
using ::testing::ElementsAre;
using ::testing::ElementsAreArray;
-using ::testing::IsEmpty;
using ::testing::Pair;
template <typename T, typename U>
diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
index 01bd40b2..57394c53 100644
--- a/absl/copts/GENERATED_AbseilCopts.cmake
+++ b/absl/copts/GENERATED_AbseilCopts.cmake
@@ -196,6 +196,7 @@ list(APPEND ABSL_MSVC_FLAGS
"/D_CRT_SECURE_NO_WARNINGS"
"/D_SCL_SECURE_NO_WARNINGS"
"/D_ENABLE_EXTENDED_ALIGNED_STORAGE"
+ "/bigobj"
"/wd4005"
"/wd4068"
"/wd4180"
diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
index 82f332f4..18dbb681 100644
--- a/absl/copts/GENERATED_copts.bzl
+++ b/absl/copts/GENERATED_copts.bzl
@@ -197,6 +197,7 @@ ABSL_MSVC_FLAGS = [
"/D_CRT_SECURE_NO_WARNINGS",
"/D_SCL_SECURE_NO_WARNINGS",
"/D_ENABLE_EXTENDED_ALIGNED_STORAGE",
+ "/bigobj",
"/wd4005",
"/wd4068",
"/wd4180",
diff --git a/absl/copts/copts.py b/absl/copts/copts.py
index 068abceb..0db6e069 100644
--- a/absl/copts/copts.py
+++ b/absl/copts/copts.py
@@ -171,6 +171,8 @@ COPT_VARS = {
MSVC_STYLE_EXCEPTIONS_FLAGS,
"ABSL_MSVC_FLAGS":
MSVC_BIG_WARNING_FLAGS + MSVC_DEFINES + [
+ # Increase the number of sections available in object files
+ "/bigobj",
"/wd4005", # macro-redefinition
"/wd4068", # unknown pragma
# qualifier applied to function type has no meaning; ignored