diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-05-06 12:10:45 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-05-06 12:10:45 -0700 |
| commit | ef41e1b34ab1f5d5793ab7ea7b3b48e533927e08 (patch) | |
| tree | a30ea3f15d36b231cbad6b8c65839c26a603d76a | |
| parent | 92042fe910cd03e3d6c7ef8f7a53a01c545975be (diff) | |
| download | gmock-ef41e1b34ab1f5d5793ab7ea7b3b48e533927e08.tar.gz | |
Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I2fc2f1469a60d20b302bf5cdd647fb0fba397313
| -rw-r--r-- | include/gmock/gmock-generated-actions.h | 4 | ||||
| -rw-r--r-- | include/gmock/gmock-generated-matchers.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h index 2327393..ab58f65 100644 --- a/include/gmock/gmock-generated-actions.h +++ b/include/gmock/gmock-generated-actions.h @@ -1384,7 +1384,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> {\ @@ -1492,7 +1492,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:\ diff --git a/include/gmock/gmock-generated-matchers.h b/include/gmock/gmock-generated-matchers.h index b4c8571..57124f7 100644 --- a/include/gmock/gmock-generated-matchers.h +++ b/include/gmock/gmock-generated-matchers.h @@ -1471,7 +1471,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:\ |