diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-01-03 21:13:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 21:13:20 -0600 |
| commit | 0ffa5f9779fc3a1b18d4931484b46825d952821d (patch) | |
| tree | f31698c81378165e2fe639e93d6f54b252b1e2c2 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | 0c0ca90382457859785a97bea5695093d72097dd (diff) | |
| parent | 3880b13e4c0b04ca88f69b9c93da6058bd836c34 (diff) | |
| download | googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.gz googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.bz2 googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.zip | |
Merge branch 'master' into chore/fix_library_json
Diffstat (limited to 'googlemock/test/gmock-generated-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-actions_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/googlemock/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc index 0fe43ab3..4c649a7e 100644 --- a/googlemock/test/gmock-generated-actions_test.cc +++ b/googlemock/test/gmock-generated-actions_test.cc @@ -428,11 +428,12 @@ TEST(DoAllTest, TenActions) { // the macro definition, as the warnings are generated when the macro // is expanded and macro expansion cannot contain #pragma. Therefore // we suppress them here. +// Also suppress C4503 decorated name length exceeded, name was truncated #ifdef _MSC_VER # pragma warning(push) # 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 @@ -1058,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 |