Skip to content

GitLab

Commit 57d6e824 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

more
parent 44da2b9a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
googletest/include/gtest/gtest.h
View file @ 57d6e824
...@@ -82,14 +82,15 @@ ...@@ -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
# pragma warning(push) # if _MSC_VER <= 1900
# pragma warning(disable:4100) # pragma warning(push)
# pragma warning(disable:4805) # pragma warning(disable:4100)
# 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() { ...@@ -2307,7 +2308,9 @@ bool StaticAssertTypeEq() {
GTEST_API_ std::string TempDir(); GTEST_API_ std::string TempDir();
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(pop) # if _MSC_VER <= 1900
# pragma warning(pop)
# endif
#endif #endif
} // namespace testing } // namespace testing
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment