summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2018-12-17 22:56:57 (GMT)
committerGennadiy Civil <misterg@google.com>2018-12-17 22:57:39 (GMT)
commit9ab640ce5e5120021c5972d7e60f258bfca64d71 (patch)
tree8f75801edb434ef60f86669eece57c2eeb8d65f1 /googlemock
parent7515e399436a832a0109d64a70b4e1125568dda5 (diff)
downloadgoogletest-9ab640ce5e5120021c5972d7e60f258bfca64d71.zip
googletest-9ab640ce5e5120021c5972d7e60f258bfca64d71.tar.gz
googletest-9ab640ce5e5120021c5972d7e60f258bfca64d71.tar.bz2
Googletest export
Suppress C4503 for MCVS , again PiperOrigin-RevId: 225895719
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-generated-actions_test.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/googlemock/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc
index 2371102..4c649a7 100644
--- a/googlemock/test/gmock-generated-actions_test.cc
+++ b/googlemock/test/gmock-generated-actions_test.cc
@@ -434,7 +434,6 @@ TEST(DoAllTest, TenActions) {
# pragma warning(disable:4100)
# pragma warning(disable:4503)
#endif
-
// Tests the ACTION*() macro family.
// Tests that ACTION() can define an action that doesn't reference the
@@ -1060,9 +1059,6 @@ TEST(ActionTemplateTest, CanBeOverloadedOnNumberOfValueParameters) {
EXPECT_EQ(12345, a4.Perform(std::make_tuple()));
}
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
} // namespace gmock_generated_actions_test
} // namespace testing