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-generated-matchers.h.pump | |
| 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-generated-matchers.h.pump')
| -rw-r--r-- | include/gmock/gmock-generated-matchers.h.pump | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/gmock/gmock-generated-matchers.h.pump b/include/gmock/gmock-generated-matchers.h.pump index 2a457aad..8fd79196 100644 --- a/include/gmock/gmock-generated-matchers.h.pump +++ b/include/gmock/gmock-generated-matchers.h.pump @@ -59,7 +59,7 @@ inline void ValidateMatcherDescription(const char* description) { template <typename Container> class ElementsAreMatcherImpl : public MatcherInterface<Container> { public: - typedef GMOCK_REMOVE_CONST(GMOCK_REMOVE_REFERENCE(Container)) RawContainer; + typedef GMOCK_REMOVE_CONST_(GMOCK_REMOVE_REFERENCE_(Container)) RawContainer; typedef typename RawContainer::value_type Element; // Constructs the matcher from a sequence of element values or @@ -198,7 +198,8 @@ class ElementsAreMatcher0 { template <typename Container> operator Matcher<Container>() const { - typedef GMOCK_REMOVE_CONST(GMOCK_REMOVE_REFERENCE(Container)) RawContainer; + typedef GMOCK_REMOVE_CONST_(GMOCK_REMOVE_REFERENCE_(Container)) + RawContainer; typedef typename RawContainer::value_type Element; const Matcher<const Element&>* const matchers = NULL; @@ -218,7 +219,8 @@ class ElementsAreMatcher$i { template <typename Container> operator Matcher<Container>() const { - typedef GMOCK_REMOVE_CONST(GMOCK_REMOVE_REFERENCE(Container)) RawContainer; + typedef GMOCK_REMOVE_CONST_(GMOCK_REMOVE_REFERENCE_(Container)) + RawContainer; typedef typename RawContainer::value_type Element; const Matcher<const Element&> matchers[] = { @@ -251,7 +253,8 @@ class ElementsAreArrayMatcher { template <typename Container> operator Matcher<Container>() const { - typedef GMOCK_REMOVE_CONST(GMOCK_REMOVE_REFERENCE(Container)) RawContainer; + typedef GMOCK_REMOVE_CONST_(GMOCK_REMOVE_REFERENCE_(Container)) + RawContainer; typedef typename RawContainer::value_type Element; return MakeMatcher(new ElementsAreMatcherImpl<Container>(first_, count_)); |