diff options
| author | Tom Hughes <tomhughes@google.com> | 2023-03-04 00:03:22 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-06 15:16:32 (GMT) |
| commit | 16feffa8fa7cb6e061787ce345c16eb24326d2ce (patch) | |
| tree | 96b4e5fce8cb287148427aa308c907e7c381edf6 /googletest/test | |
| parent | dc10c3b5e55c1101e7759bdb7bf9790cebbf4ad2 (diff) | |
| download | googletest-16feffa8fa7cb6e061787ce345c16eb24326d2ce.zip googletest-16feffa8fa7cb6e061787ce345c16eb24326d2ce.tar.gz googletest-16feffa8fa7cb6e061787ce345c16eb24326d2ce.tar.bz2 | |
Replace "#if GTEST_HAS_ABSL" with "#ifdef GTEST_HAS_ABSL"
This allows compilation with "-Wundef" (#3267).
PiperOrigin-RevId: 513945230
Change-Id: I45ef19c7ff3d20e97216bd031d406a03365471da
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-port-test.cc | 2 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc index f3ebda9..d01ccaa 100644 --- a/googletest/test/googletest-port-test.cc +++ b/googletest/test/googletest-port-test.cc @@ -390,7 +390,7 @@ TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) { // the platform. The test will produce compiler errors in case of failure. // For simplicity, we only cover the most important platforms here. TEST(RegexEngineSelectionTest, SelectsCorrectRegexEngine) { -#if GTEST_HAS_ABSL +#ifdef GTEST_HAS_ABSL EXPECT_TRUE(GTEST_USES_RE2); #elif GTEST_HAS_POSIX_RE EXPECT_TRUE(GTEST_USES_POSIX_RE); diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 2f137d2..aea8e1f 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -6178,12 +6178,12 @@ TEST_F(ParseFlagsTest, FilterBad) { const char* argv2[] = {"foo.exe", "--gtest_filter", nullptr}; -#if GTEST_HAS_ABSL && defined(GTEST_HAS_DEATH_TEST) +#if defined(GTEST_HAS_ABSL) && defined(GTEST_HAS_DEATH_TEST) // Invalid flag arguments are a fatal error when using the Abseil Flags. EXPECT_EXIT(GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), true), testing::ExitedWithCode(1), "ERROR: Missing the value for the flag 'gtest_filter'"); -#elif !GTEST_HAS_ABSL +#elif !defined(GTEST_HAS_ABSL) GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), true); #else static_cast<void>(argv); @@ -6197,12 +6197,12 @@ TEST_F(ParseFlagsTest, OutputEmpty) { const char* argv2[] = {"foo.exe", "--gtest_output", nullptr}; -#if GTEST_HAS_ABSL && defined(GTEST_HAS_DEATH_TEST) +#if defined(GTEST_HAS_ABSL) && defined(GTEST_HAS_DEATH_TEST) // Invalid flag arguments are a fatal error when using the Abseil Flags. EXPECT_EXIT(GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), true), testing::ExitedWithCode(1), "ERROR: Missing the value for the flag 'gtest_output'"); -#elif !GTEST_HAS_ABSL +#elif !defined(GTEST_HAS_ABSL) GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), true); #else static_cast<void>(argv); @@ -6210,7 +6210,7 @@ TEST_F(ParseFlagsTest, OutputEmpty) { #endif } -#if GTEST_HAS_ABSL +#ifdef GTEST_HAS_ABSL TEST_F(ParseFlagsTest, AbseilPositionalFlags) { const char* argv[] = {"foo.exe", "--gtest_throw_on_failure=1", "--", "--other_flag", nullptr}; |