maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Export of internal Abseil changes

Browse source 
--
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
This commit is contained in:
Abseil Team 2019-08-27 09:03:36 -07:00 • committed by Eric Fiselier
parent 2d2d7fbc28
commit a0d1e098c2
5 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
absl/container/CMakeLists.txt
View file

@ -71,6 +71,10 @@ absl_cc_test(
btree_test btree_test
SRCS SRCS
"btree_test.cc" "btree_test.cc"
COPTS
${ABSL_TEST_COPTS}
LINKOPTS
${ABSL_DEFAULT_LINKOPTS}
DEPS DEPS
absl::btree absl::btree
absl::btree_test_common absl::btree_test_common

1
absl/container/btree_test.cc
View file

@ -49,7 +49,6 @@ using ::absl::test_internal::InstanceTracker;
using ::absl::test_internal::MovableOnlyInstance; using ::absl::test_internal::MovableOnlyInstance;
using ::testing::ElementsAre; using ::testing::ElementsAre;
using ::testing::ElementsAreArray; using ::testing::ElementsAreArray;
using ::testing::IsEmpty;
using ::testing::Pair; using ::testing::Pair;
template <typename T, typename U> template <typename T, typename U>

1
absl/copts/GENERATED_AbseilCopts.cmake
View file

@ -196,6 +196,7 @@ list(APPEND ABSL_MSVC_FLAGS
"/D_CRT_SECURE_NO_WARNINGS" "/D_CRT_SECURE_NO_WARNINGS"
"/D_SCL_SECURE_NO_WARNINGS" "/D_SCL_SECURE_NO_WARNINGS"
"/D_ENABLE_EXTENDED_ALIGNED_STORAGE" "/D_ENABLE_EXTENDED_ALIGNED_STORAGE"
"/bigobj"
"/wd4005" "/wd4005"
"/wd4068" "/wd4068"
"/wd4180" "/wd4180"

1
absl/copts/GENERATED_copts.bzl
View file

@ -197,6 +197,7 @@ ABSL_MSVC_FLAGS = [
"/D_CRT_SECURE_NO_WARNINGS", "/D_CRT_SECURE_NO_WARNINGS",
"/D_SCL_SECURE_NO_WARNINGS", "/D_SCL_SECURE_NO_WARNINGS",
"/D_ENABLE_EXTENDED_ALIGNED_STORAGE", "/D_ENABLE_EXTENDED_ALIGNED_STORAGE",
"/bigobj",
"/wd4005", "/wd4005",
"/wd4068", "/wd4068",
"/wd4180", "/wd4180",

2
absl/copts/copts.py
View file

@ -171,6 +171,8 @@ COPT_VARS = {
MSVC_STYLE_EXCEPTIONS_FLAGS, MSVC_STYLE_EXCEPTIONS_FLAGS,
"ABSL_MSVC_FLAGS": "ABSL_MSVC_FLAGS":
MSVC_BIG_WARNING_FLAGS + MSVC_DEFINES + [ MSVC_BIG_WARNING_FLAGS + MSVC_DEFINES + [
# Increase the number of sections available in object files
"/bigobj",
"/wd4005", # macro-redefinition "/wd4005", # macro-redefinition
"/wd4068", # unknown pragma "/wd4068", # unknown pragma
# qualifier applied to function type has no meaning; ignored # qualifier applied to function type has no meaning; ignored