diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-02-19 00:33:37 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-02-19 00:33:37 +0000 |
| commit | e0d051ea64dd5f32d5b6af9831747d1acb2a9c40 (patch) | |
| tree | 83a8ec3fc0583114b7b3f790edacac5e081a0e52 /include/gmock/gmock-spec-builders.h | |
| parent | 7a13fee2f01e4d052f520018f985da98790deb3d (diff) | |
| download | googletest-e0d051ea64dd5f32d5b6af9831747d1acb2a9c40.tar.gz googletest-e0d051ea64dd5f32d5b6af9831747d1acb2a9c40.tar.bz2 googletest-e0d051ea64dd5f32d5b6af9831747d1acb2a9c40.zip | |
Makes sure all internal macros are named GMOCK_*_. No functionality is changed.
Diffstat (limited to 'include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | include/gmock/gmock-spec-builders.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index 0364b570..bd956f3d 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -378,7 +378,7 @@ class InSequence { bool sequence_created_; GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence); // NOLINT -} GMOCK_ATTRIBUTE_UNUSED; +} GMOCK_ATTRIBUTE_UNUSED_; namespace internal { @@ -1562,13 +1562,13 @@ inline const T& Const(const T& x) { return x; } // of the method used in call is a result of macro expansion. // See CompilesWithMethodNameExpandedFromMacro tests in // internal/gmock-spec-builders_test.cc for more details. -#define ON_CALL_IMPL_(obj, call) \ +#define GMOCK_ON_CALL_IMPL_(obj, call) \ ((obj).gmock_##call).InternalDefaultActionSetAt(__FILE__, __LINE__, \ #obj, #call) -#define ON_CALL(obj, call) ON_CALL_IMPL_(obj, call) +#define ON_CALL(obj, call) GMOCK_ON_CALL_IMPL_(obj, call) -#define EXPECT_CALL_IMPL_(obj, call) \ +#define GMOCK_EXPECT_CALL_IMPL_(obj, call) \ ((obj).gmock_##call).InternalExpectedAt(__FILE__, __LINE__, #obj, #call) -#define EXPECT_CALL(obj, call) EXPECT_CALL_IMPL_(obj, call) +#define EXPECT_CALL(obj, call) GMOCK_EXPECT_CALL_IMPL_(obj, call) #endif // GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ |