diff options
| author | billydonahue <billydonahue@google.com> | 2014-05-19 17:54:51 +0000 |
|---|---|---|
| committer | billydonahue <billydonahue@google.com> | 2014-05-19 17:54:51 +0000 |
| commit | 1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01 (patch) | |
| tree | f05cabf6742496f8709c9df23aae8b8d002ea08f /include/gmock/gmock-generated-matchers.h | |
| parent | bd0188320de5aab1b09718e2c466387099d43cfb (diff) | |
| download | googletest-1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01.tar.gz googletest-1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01.tar.bz2 googletest-1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01.zip | |
Push several shanges:
Make single argument constructors explicit in macros.
Remove NOMINMAX macro.
Add macros for disabling Microsoft Visual C++ warnings.
Add WhenDynamicCastTo<T> matcher.
A matcher that matches a pointer that matches inner_matcher when
dynamic_cast<T> is applied.
Add IWYU export pragmas to the tuple include lines.
Fix NativeArray to not require a copy constructor unless we ask for one.
This allows ElementsAre() to support non-copyable types.
Examine WINAPI_FAMILY_PARTITION macros to better distinguish windows platforms.
Author: martin@martin.st
From: https://codereview.appspot.com/57220043/
Diffstat (limited to 'include/gmock/gmock-generated-matchers.h')
| -rw-r--r-- | include/gmock/gmock-generated-matchers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/gmock-generated-matchers.h b/include/gmock/gmock-generated-matchers.h index 967fcf9f..57056fd9 100644 --- a/include/gmock/gmock-generated-matchers.h +++ b/include/gmock/gmock-generated-matchers.h @@ -1460,7 +1460,7 @@ AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) { return ::testing::Matcher<arg_type>(\ new gmock_Impl<arg_type>(p0));\ }\ - name##MatcherP(p0##_type gmock_p0) : p0(gmock_p0) {\ + explicit name##MatcherP(p0##_type gmock_p0) : p0(gmock_p0) {\ }\ p0##_type p0;\ private:\ |