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-actions.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-actions.h')
| -rw-r--r-- | include/gmock/gmock-generated-actions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h index f511bc8b..f8ffc509 100644 --- a/include/gmock/gmock-generated-actions.h +++ b/include/gmock/gmock-generated-actions.h @@ -1347,7 +1347,7 @@ DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, GMOCK_INTERNAL_DECL_TYPE_##value_params>\ class GMOCK_ACTION_CLASS_(name, value_params) {\ public:\ - GMOCK_ACTION_CLASS_(name, value_params)\ + explicit GMOCK_ACTION_CLASS_(name, value_params)\ GMOCK_INTERNAL_INIT_##value_params {}\ template <typename F>\ class gmock_Impl : public ::testing::ActionInterface<F> {\ @@ -1455,7 +1455,7 @@ DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, template <typename p0##_type>\ class name##ActionP {\ public:\ - name##ActionP(p0##_type gmock_p0) : p0(gmock_p0) {}\ + explicit name##ActionP(p0##_type gmock_p0) : p0(gmock_p0) {}\ template <typename F>\ class gmock_Impl : public ::testing::ActionInterface<F> {\ public:\ |