diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-08-27 18:00:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 18:00:04 -0500 |
| commit | 85f059f03d56ce82cf8f68cf7505b695a0c730c2 (patch) | |
| tree | e715b911578e831d7a3fdf46bbf2bdbece4fafc3 /googlemock/test/gmock-generated-actions_test.cc | |
| parent | 130e5aa86a7a71501cf8fa7cd6f507928f01bd79 (diff) | |
| parent | fdd6a1dc8c74bf37211c14a1b2e4b64755bb3380 (diff) | |
| download | googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.gz googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.bz2 googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.zip | |
Merge pull request #3 from google/master
Update master
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 |