diff options
| author | Matt Calabrese <calabrese@x.team> | 2019-12-13 12:57:35 -0500 |
|---|---|---|
| committer | Matt Calabrese <calabrese@x.team> | 2019-12-13 12:57:35 -0500 |
| commit | 88ba008c234a1d4e54c62dfc71b4060696a86f36 (patch) | |
| tree | afd922b68f48aacba48d243f9a4727d93bf462f5 /googlemock/include/gmock | |
| parent | a3097c826e4d5aa3cce1e561f619dc652f5a9ced (diff) | |
| parent | ecefcbd4aa714053befb6a5415cf2640181414ce (diff) | |
| download | googletest-88ba008c234a1d4e54c62dfc71b4060696a86f36.tar.gz googletest-88ba008c234a1d4e54c62dfc71b4060696a86f36.tar.bz2 googletest-88ba008c234a1d4e54c62dfc71b4060696a86f36.zip | |
Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355
PiperOrigin-RevId: 284234675
Diffstat (limited to 'googlemock/include/gmock')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 8 |
1 files changed, 0 insertions, 8 deletions
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&> { 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<T> holds a value of type T, where T must be a @@ -1786,8 +1780,6 @@ class FunctionMocker<R(Args...)> 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); |