Skip to content

Commit b479e7a

Browse files
zetafunctioncopybara-github
authored andcommitted
Guard Abseil flags usage in googlemock with GTEST_NO_ABSL_FLAGS.
googletest avoids using the Abseil flag library, so googlemock should do the same for consistency. PiperOrigin-RevId: 614713968 Change-Id: I0925804b8644ddc6fd3ad07a320d94829b11bb8e
1 parent e1a38bc commit b479e7a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

googlemock/include/gmock/internal/gmock-port.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#include "gmock/internal/custom/gmock-port.h"
5757
#include "gtest/internal/gtest-port.h"
5858

59-
#ifdef GTEST_HAS_ABSL
59+
#if defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
6060
#include "absl/flags/declare.h"
6161
#include "absl/flags/flag.h"
6262
#endif
@@ -73,7 +73,7 @@
7373
#define GMOCK_FLAG(name) FLAGS_gmock_##name
7474

7575
// Pick a command line flags implementation.
76-
#ifdef GTEST_HAS_ABSL
76+
#if defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
7777

7878
// Macros for defining flags.
7979
#define GMOCK_DEFINE_bool_(name, default_val, doc) \
@@ -95,7 +95,7 @@
9595
#define GMOCK_FLAG_SET(name, value) \
9696
(void)(::absl::SetFlag(&GMOCK_FLAG(name), value))
9797

98-
#else // GTEST_HAS_ABSL
98+
#else // defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
9999

100100
// Macros for defining flags.
101101
#define GMOCK_DEFINE_bool_(name, default_val, doc) \
@@ -134,6 +134,6 @@
134134
#define GMOCK_FLAG_GET(name) ::testing::GMOCK_FLAG(name)
135135
#define GMOCK_FLAG_SET(name, value) (void)(::testing::GMOCK_FLAG(name) = value)
136136

137-
#endif // GTEST_HAS_ABSL
137+
#endif // defined(GTEST_HAS_ABSL) && !defined(GTEST_NO_ABSL_FLAGS)
138138

139139
#endif // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_

0 commit comments

Comments
 (0)