diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-10 02:10:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 02:10:12 (GMT) |
| commit | ca54b673034f6f182ff22ac554efcd1176f5808c (patch) | |
| tree | 5ee7b5cef61b4b0c0c2fb904ea62444ae7d71709 /googletest/include | |
| parent | 7f03f7ceae05d4d45fc4b12b81736c55a13d872c (diff) | |
| download | googletest-ca54b673034f6f182ff22ac554efcd1176f5808c.zip googletest-ca54b673034f6f182ff22ac554efcd1176f5808c.tar.gz googletest-ca54b673034f6f182ff22ac554efcd1176f5808c.tar.bz2 | |
Revert "gmock actions 2"refs/pull/1556/head
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 1c39310..26e787d 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,15 +82,6 @@ namespace testing { -// 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:4805) -# pragma warning(disable:4100) -#endif - - // Declares the flags. // This flag temporary enables the disabled tests. @@ -2307,10 +2298,6 @@ bool StaticAssertTypeEq() { // Tries to determine an appropriate directory for the platform. GTEST_API_ std::string TempDir(); -#ifdef _MSC_VER -# pragma warning(pop) -#endif - } // namespace testing // Use this function in main() to run all tests. It returns 0 if all |