From 1f5fdea417f1a55cffcfc0711d345d1d8ca2bc01 Mon Sep 17 00:00:00 2001 From: billydonahue Date: Mon, 19 May 2014 17:54:51 +0000 Subject: Push several shanges: Make single argument constructors explicit in macros. Remove NOMINMAX macro. Add macros for disabling Microsoft Visual C++ warnings. Add WhenDynamicCastTo matcher. A matcher that matches a pointer that matches inner_matcher when dynamic_cast 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/ --- include/gmock/gmock-generated-actions.h.pump | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/gmock/gmock-generated-actions.h.pump') diff --git a/include/gmock/gmock-generated-actions.h.pump b/include/gmock/gmock-generated-actions.h.pump index 9fba5988..9197e873 100644 --- a/include/gmock/gmock-generated-actions.h.pump +++ b/include/gmock/gmock-generated-actions.h.pump @@ -606,7 +606,7 @@ $range k 0..n-1 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 \ class gmock_Impl : public ::testing::ActionInterface {\ @@ -694,7 +694,7 @@ $var macro_name = [[$if i==0 [[ACTION]] $elif i==1 [[ACTION_P]] #define $macro_name(name$for j [[, p$j]])\$template class $class_name {\ public:\ - $class_name($ctor_param_list)$inits {}\ + [[$if i==1 [[explicit ]]]]$class_name($ctor_param_list)$inits {}\ template \ class gmock_Impl : public ::testing::ActionInterface {\ public:\ -- cgit v1.2.3