Skip to content

GitLab

Commit c1d4c342 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

this should be it
parent f5871009
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
googletest/include/gtest/gtest.h
View file @ c1d4c342
...@@ -87,9 +87,7 @@ namespace testing { ...@@ -87,9 +87,7 @@ namespace testing {
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4805) # pragma warning(disable:4805)
# if _MSC_VER <= 1900
# pragma warning(disable:4100) # pragma warning(disable:4100)
# endif
#endif #endif
...@@ -2310,9 +2308,7 @@ bool StaticAssertTypeEq() { ...@@ -2310,9 +2308,7 @@ 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
......
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