diff options
| author | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-11-17 16:55:07 +0100 |
|---|---|---|
| committer | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-11-22 17:15:23 +0100 |
| commit | ecefcbd4aa714053befb6a5415cf2640181414ce (patch) | |
| tree | 883e4314f1d2a4662afb5a7f51fe2cbca173722a /googlemock | |
| parent | f9665846e405664bec650d77f9dd236c61a293b0 (diff) | |
| download | googletest-ecefcbd4aa714053befb6a5415cf2640181414ce.tar.gz googletest-ecefcbd4aa714053befb6a5415cf2640181414ce.tar.bz2 googletest-ecefcbd4aa714053befb6a5415cf2640181414ce.zip | |
remove MSVC workaround: warning 4355
Diffstat (limited to 'googlemock')
| -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); |