diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:38:38 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 15:38:38 -0400 |
| commit | 055f32199a81a159eebeaabb6666d6de11127064 (patch) | |
| tree | a6df074a1bdec3144bdda32926a64c61de8c2ef3 /googlemock/test/gmock_output_test_.cc | |
| parent | 57d6e824b44be45a084fe6baffdfc27b8f8d623f (diff) | |
| download | googletest-055f32199a81a159eebeaabb6666d6de11127064.tar.gz googletest-055f32199a81a159eebeaabb6666d6de11127064.tar.bz2 googletest-055f32199a81a159eebeaabb6666d6de11127064.zip | |
tuning
Diffstat (limited to 'googlemock/test/gmock_output_test_.cc')
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index d5f909d9..4166c6c6 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -42,8 +42,10 @@ // Silence C4100 (unreferenced formal parameter) for MSVC #ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4100) +# if _MSC_VER <= 1900 +# pragma warning(push) +# pragma warning(disable:4100) +# endif #endif @@ -308,5 +310,7 @@ int main(int argc, char **argv) { } #ifdef _MSC_VER -# pragma warning(pop) +# if _MSC_VER <= 1900 +# pragma warning(pop) +# endif #endif |