Roll third_party/googletest/src/ a325ad2db..4bd8c4638 (125 commits)
https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/a325ad2db5de..4bd8c4638ada
Created with:
roll-dep third_party/googletest/src
Change-Id: I963e0b39119ab564754a81d20c38b5641b9230b5
Reviewed-on: https://pdfium-review.googlesource.com/31130
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index d04d804..e2b4bd6 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -14,13 +14,12 @@
# In order to allow regex matches in gtest to be shared between Windows
# and other systems, we tell gtest to always use its internal engine.
"GTEST_HAS_POSIX_RE=0",
+
+ # Enables C++11 features.
"GTEST_LANG_CXX11=1",
- # ::testing::Combine, which is heavily used in Chromium, is gated on
- # tr1::tuple. Upstream avoids using tr1::tuple on Visual Studio 2017+,
- # because it causes warnings. We'll take (and ignore) the warnings to keep
- # our ::testing::Combine.
- "GTEST_HAS_TR1_TUPLE=1",
+ # Prevents gtest from including both <tr1/tuple> and <tuple>.
+ "GTEST_HAS_TR1_TUPLE=0",
]
# Gtest headers need to be able to find themselves.