summaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-actions_test.cc
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-09 15:50:19 -0400
committerGennadiy Civil <misterg@google.com>2018-04-09 15:50:19 -0400
commit05b5a53898c2466e49f37e84324644949d279b34 (patch)
treec16ffae0ea09c666885b228c2cc45acb5ecab1cb /googlemock/test/gmock-actions_test.cc
parent2de24fbf7a26e679e8dc7d185addd3dc820f347c (diff)
downloadgoogletest-05b5a53898c2466e49f37e84324644949d279b34.tar.gz
googletest-05b5a53898c2466e49f37e84324644949d279b34.zip
formatting
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
-rw-r--r--googlemock/test/gmock-actions_test.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index cd517a7d..5dd48460 100644
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
@@ -33,6 +33,8 @@
//
// This file tests the built-in actions.
+// Silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 14,15
#ifdef _MSC_VER
#if _MSC_VER <= 1900
# pragma warning(push)
@@ -1569,3 +1571,4 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
# pragma warning(pop)
#endif
#endif
+
OpenPOWER on IntegriCloud