diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/googletest/BUILD.gn | 9 | ||||
| -rw-r--r-- | third_party/googletest/README.pdfium | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index d04d804046..e2b4bd6a9d 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -14,13 +14,12 @@ config("gtest_config") { # 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. diff --git a/third_party/googletest/README.pdfium b/third_party/googletest/README.pdfium index 1b3626cf4b..efbb22950d 100644 --- a/third_party/googletest/README.pdfium +++ b/third_party/googletest/README.pdfium @@ -1,7 +1,7 @@ Name: Google Test: Google's C++ Testing Framework Short Name: googletest URL: https://github.com/google/googletest.git -Version: 1.8.0.git-7d15497f7538fb531d0f025929d080743af421ee +Version: 1.8.0.git-4bd8c4638ada823a8da2569735cc0a9402fb8052 License: BSD License File: NOT_SHIPPED Security critical: no |