google/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-11-12 07:44:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

... and this

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-09 16:24:30 -04:00
parent c1d4c34233
commit 64d24b810f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
googlemock/test/gmock_output_test_.cc
View File

@@ -39,13 +39,11 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 // Silence C4100 (unreferenced formal parameter)
#ifdef _MSC_VER #ifdef _MSC_VER
# if _MSC_VER <= 1900
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
#endif #endif
#endif
using testing::_; using testing::_;
using testing::AnyNumber; using testing::AnyNumber;
@@ -308,7 +306,5 @@ int main(int argc, char **argv) {
} }
#ifdef _MSC_VER #ifdef _MSC_VER
# if _MSC_VER <= 1900
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#endif