Skip to content

Commit

Permalink
Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 284234675
  • Loading branch information
mattcalabrese-google committed Dec 13, 2019
2 parents a3097c8 + ecefcbd commit 88ba008
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions googlemock/include/gmock/gmock-spec-builders.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 88ba008

Please sign in to comment.