summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-01-23 15:06:23 (GMT)
committerXiaoyi Zhang <zhangxy@google.com>2020-01-24 20:30:17 (GMT)
commitb6b9b2bc0e7c08b509408c05e4737686cd380bae (patch)
tree309a457bbcc00aa9abbf33d96d3bf78cf1a68f57
parent10b1902d893ea8cc43c69541d70868f91af3646b (diff)
downloadgoogletest-b6b9b2bc0e7c08b509408c05e4737686cd380bae.zip
googletest-b6b9b2bc0e7c08b509408c05e4737686cd380bae.tar.gz
googletest-b6b9b2bc0e7c08b509408c05e4737686cd380bae.tar.bz2
Export Test - Do Not Merge
Add missing explicit keyword for gmock_Impl constructor. When switching to using GMOCK_PP in ACTION* macroses `explicit` keyword was missed in gmock_Impl constructor causing ClangTidy warnings in ACTION_P macro. PiperOrigin-RevId: 291159975
-rw-r--r--googlemock/include/gmock/gmock-actions.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h
index 8801179..e46bcaa 100644
--- a/googlemock/include/gmock/gmock-actions.h
+++ b/googlemock/include/gmock/gmock-actions.h
@@ -1426,7 +1426,7 @@ auto InvokeArgumentAdl(AdlTag, F f, Args... args) -> decltype(f(args...)) {
typedef typename ::testing::internal::Function<F>::Result return_type; \
typedef \
typename ::testing::internal::Function<F>::ArgumentTuple args_type; \
- gmock_Impl(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params)) \
+ explicit gmock_Impl(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params)) \
: GMOCK_ACTION_INIT_PARAMS_(params) {} \
return_type Perform(const args_type& args) override { \
return ::testing::internal::ActionHelper<return_type, \