diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 20:13:45 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 20:13:45 (GMT) |
| commit | c1d4c34233e05bbcd4ba4abd72198327f550818f (patch) | |
| tree | d349a71511e95b5afc2ef61e5e9d41da74bce39a /googletest | |
| parent | f5871009e6d8db73c0516efeb2955436b7134fb4 (diff) | |
| download | googletest-c1d4c34233e05bbcd4ba4abd72198327f550818f.zip googletest-c1d4c34233e05bbcd4ba4abd72198327f550818f.tar.gz googletest-c1d4c34233e05bbcd4ba4abd72198327f550818f.tar.bz2 | |
this should be it
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index efa98d5..1c39310 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -87,9 +87,7 @@ namespace testing { #ifdef _MSC_VER # pragma warning(push) # pragma warning(disable:4805) -# if _MSC_VER <= 1900 # pragma warning(disable:4100) -# endif #endif @@ -2310,9 +2308,7 @@ bool StaticAssertTypeEq() { GTEST_API_ std::string TempDir(); #ifdef _MSC_VER -# if _MSC_VER <= 1900 # pragma warning(pop) -# endif #endif } // namespace testing |