gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-09 15:33:56 -04:00
parent 44da2b9ac5
commit 57d6e824b4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
googletest/include/gtest/gtest.h
View File

@ -82,14 +82,15 @@
namespace testing { namespace testing {
// Silence C4100 (unreferenced formal parameter) for MSVC // Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15
#ifdef _MSC_VER #ifdef _MSC_VER
# if _MSC_VER <= 1900
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
# pragma warning(disable:4805) # pragma warning(disable:4805)
# endif
#endif #endif
// Declares the flags. // Declares the flags.
// This flag temporary enables the disabled tests. // This flag temporary enables the disabled tests.
@ -2307,7 +2308,9 @@ bool StaticAssertTypeEq() {
GTEST_API_ std::string TempDir(); GTEST_API_ std::string TempDir();
#ifdef _MSC_VER #ifdef _MSC_VER
# if _MSC_VER <= 1900
# pragma warning(pop) # pragma warning(pop)
# endif
#endif #endif
} // namespace testing } // namespace testing