commit f68c7ea3c48b8c60d79f71f02f4188b42a5dfc1c
author Chih-hung Hsieh <chh@google.com> Tue May 10 17:03:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 10 17:03:57 2016 +0000
tree a30ea3f15d36b231cbad6b8c65839c26a603d76a
parent 92042fe910cd03e3d6c7ef8f7a53a01c545975be
parent ef41e1b34ab1f5d5793ab7ea7b3b48e533927e08

Merge "Fix google-explicit-constructor warnings."

include/gmock/gmock-generated-actions.h

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 @@
             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 @@
   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:\

include/gmock/gmock-generated-matchers.h

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 @@
       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:\