X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=googlemock%2Ftest%2Fgmock_output_test_.cc;h=03d842139fa8675831a8abf71af1949b16abc196;hb=35012fd0964a1a5455ccd93dd34531ce90728a08;hp=a178691591bc1ef8117ee81a5d418d539f48df20;hpb=97dde157c1ee3bddda75c6eaf3787507f21e674e;p=platform%2Fupstream%2Fgtest.git

diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc
index a178691..03d8421 100644
--- a/googlemock/test/gmock_output_test_.cc
+++ b/googlemock/test/gmock_output_test_.cc
@@ -38,10 +38,7 @@
 #include "gtest/gtest.h"
 
 // Silence C4100 (unreferenced formal parameter)
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100)
 
 using testing::_;
 using testing::AnyNumber;
@@ -55,7 +52,7 @@ using testing::Value;
 
 class MockFoo {
  public:
-  MockFoo() {}
+  MockFoo() = default;
 
   MOCK_METHOD3(Bar, char(const std::string& s, int i, double x));
   MOCK_METHOD2(Bar2, bool(int x, int y));
@@ -286,6 +283,4 @@ int main(int argc, char** argv) {
   return RUN_ALL_TESTS();
 }
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+GTEST_DISABLE_MSC_WARNINGS_POP_()  // 4100