diff options
author | Gennadiy Civil <misterg@google.com> | 2018-04-10 19:57:16 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 19:57:16 (GMT) |
commit | e1071eb9497304a38e69737e90a88b4877b8b736 (patch) | |
tree | a3f997e6412a22622588cb7e7468920678774054 /googletest/include/gtest/gtest.h | |
parent | d0de1180e44bb279361ebe3ce9ba3d860bdad4b2 (diff) | |
download | googletest-e1071eb9497304a38e69737e90a88b4877b8b736.zip googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.gz googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.bz2 |
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
Diffstat (limited to 'googletest/include/gtest/gtest.h')
-rw-r--r-- | googletest/include/gtest/gtest.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index cbab121..1c39310 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,11 +82,12 @@ namespace testing { -// Silence C4100 (unreferenced formal parameter) for MSVC +// Silence C4100 (unreferenced formal parameter) and 4805 +// unsafe mix of type 'const int' and type 'const bool' #ifdef _MSC_VER # pragma warning(push) -# pragma warning(disable:4100) # pragma warning(disable:4805) +# pragma warning(disable:4100) #endif @@ -2307,7 +2308,7 @@ bool StaticAssertTypeEq() { GTEST_API_ std::string TempDir(); #ifdef _MSC_VER -# pragma warning(pop) +# pragma warning(pop) #endif } // namespace testing |