From ecefcbd4aa714053befb6a5415cf2640181414ce Mon Sep 17 00:00:00 2001 From: Krystian Kuzniarek Date: Sun, 17 Nov 2019 16:55:07 +0100 Subject: remove MSVC workaround: warning 4355 --- googlemock/include/gmock/gmock-spec-builders.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'googlemock/include') diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 80c13b55..718c9484 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -1350,12 +1350,6 @@ class ReferenceOrValueWrapper { T* value_ptr_; }; -// MSVC warns about using 'this' in base member initializer list, so -// we need to temporarily disable the warning. We have to do it for -// the entire class to suppress the warning, even though it's about -// the constructor only. -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355) - // C++ treats the void type specially. For example, you cannot define // a void-typed variable or pass a void value to a function. // ActionResultHolder holds a value of type T, where T must be a @@ -1786,8 +1780,6 @@ class FunctionMocker final : public UntypedFunctionMockerBase { } }; // class FunctionMocker -GTEST_DISABLE_MSC_WARNINGS_POP_() // 4355 - // Reports an uninteresting call (whose description is in msg) in the // manner specified by 'reaction'. void ReportUninterestingCall(CallReaction reaction, const std::string& msg); -- cgit v1.2.1