aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock_output_test_.cc
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-04-09 22:10:12 -0400
committerGitHub <noreply@github.com>2018-04-09 22:10:12 -0400
commitca54b673034f6f182ff22ac554efcd1176f5808c (patch)
tree5ee7b5cef61b4b0c0c2fb904ea62444ae7d71709 /googlemock/test/gmock_output_test_.cc
parent7f03f7ceae05d4d45fc4b12b81736c55a13d872c (diff)
downloadgoogletest-ca54b673034f6f182ff22ac554efcd1176f5808c.tar.gz
googletest-ca54b673034f6f182ff22ac554efcd1176f5808c.tar.bz2
googletest-ca54b673034f6f182ff22ac554efcd1176f5808c.zip
Revert "gmock actions 2"
Diffstat (limited to 'googlemock/test/gmock_output_test_.cc')
-rw-r--r--googlemock/test/gmock_output_test_.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc
index 1b59eb3f..ca628df6 100644
--- a/googlemock/test/gmock_output_test_.cc
+++ b/googlemock/test/gmock_output_test_.cc
@@ -39,12 +39,6 @@
#include "gtest/gtest.h"
-// Silence C4100 (unreferenced formal parameter)
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#endif
-
using testing::_;
using testing::AnyNumber;
using testing::Ge;
@@ -304,7 +298,3 @@ int main(int argc, char **argv) {
TestCatchesLeakedMocksInAdHocTests();
return RUN_ALL_TESTS();
}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif