diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-09 22:37:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 22:37:50 -0400 |
| commit | a072611118dfbdb12ca5d536e852029359e07581 (patch) | |
| tree | 5ee7b5cef61b4b0c0c2fb904ea62444ae7d71709 /googlemock/src/gmock-spec-builders.cc | |
| parent | 7f03f7ceae05d4d45fc4b12b81736c55a13d872c (diff) | |
| parent | ca54b673034f6f182ff22ac554efcd1176f5808c (diff) | |
| download | googletest-a072611118dfbdb12ca5d536e852029359e07581.tar.gz googletest-a072611118dfbdb12ca5d536e852029359e07581.tar.bz2 googletest-a072611118dfbdb12ca5d536e852029359e07581.zip | |
Merge pull request #1556 from google/revert-1551-master
Revert "gmock actions 2"
Diffstat (limited to 'googlemock/src/gmock-spec-builders.cc')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 22d002fe..b97bad03 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -49,15 +49,6 @@ # include <unistd.h> // NOLINT #endif -// Silence C4800 (C4800: 'int *const ': forcing value -// to bool 'true' or 'false') for MSVC 14,15 -#ifdef _MSC_VER -#if _MSC_VER <= 1900 -# pragma warning(push) -# pragma warning(disable:4800) -#endif -#endif - namespace testing { namespace internal { @@ -875,9 +866,3 @@ InSequence::~InSequence() { } } // namespace testing - -#ifdef _MSC_VER -#if _MSC_VER <= 1900 -# pragma warning(pop) -#endif -#endif |