From a0d1e098c2f99694fa399b175a7ccf920762030e Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 27 Aug 2019 09:03:36 -0700 Subject: Export of internal Abseil changes -- f685906f54727cc2d356787af410ef72ddd38bd0 by Derek Mauro : On Windows, compile with /bigobj. Some template heavy code requires this. PiperOrigin-RevId: 265695531 -- ed808812a4f5915d0516cecdc24ef4b90cf8333e by Derek Mauro : Fix the btree_test build on Windows+CMake PiperOrigin-RevId: 265689993 -- c9a8ade28d7537d1dceec19c74edc4b10daf3c91 by Abseil Team : Remove unused using ::test::IsEmpty. PiperOrigin-RevId: 265567080 GitOrigin-RevId: f685906f54727cc2d356787af410ef72ddd38bd0 Change-Id: I12a3c9ef41c1b7c4c5f075a1ad4cedad54e953ac --- absl/container/CMakeLists.txt | 4 ++++ absl/container/btree_test.cc | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'absl/container') diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt index a691222034af..111cc783ee41 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 d213ee617ecb..4edb2775be86 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 -- cgit 1.4.1