diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-18 15:18:03 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-18 15:18:03 -0400 |
| commit | 881ee307a7602a826a76209b121ae30aabdc9f21 (patch) | |
| tree | 8f8f3c606730288261ecc399936f21cdb8bf2ff2 /googlemock/test/gmock-matchers_test.cc | |
| parent | 10e8ec2714a38cee7ec39118042e6a3fac589767 (diff) | |
| download | googletest-881ee307a7602a826a76209b121ae30aabdc9f21.tar.gz googletest-881ee307a7602a826a76209b121ae30aabdc9f21.tar.bz2 googletest-881ee307a7602a826a76209b121ae30aabdc9f21.zip | |
typo
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 72dff85c..de02929b 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -33,6 +33,13 @@ // // This file tests some commonly used argument matchers. +// Disable MSVC2015 warning for std::pair: +// "decorated name length exceeded, name was truncated". +#if defined _MSC_VER +# pragma warning(push) +# pragma warning(disable:4503) +#endif + #include "gmock/gmock-matchers.h" #include "gmock/gmock-more-matchers.h" @@ -59,13 +66,6 @@ # include <forward_list> // NOLINT #endif -// Disable MSVC2015 warning for std::pair: -// "decorated name length exceeded, name was truncated". -#if defined _MSC_VER -# pragma warning(push) -# pragma warning(disable:4503) -#endif - #if GTEST_LANG_CXX11 # include <type_traits> #endif |