diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 09:59:09 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 09:59:09 -0400 |
| commit | 03be5df17cc7e377a2cad4e110f2f6270d212eb9 (patch) | |
| tree | 1a5601edfc761c407851b2a0b3a6fbaf23e1ed10 /googlemock/src | |
| parent | e0b3c269c23e152ed44e0f4db585319e4e5d5630 (diff) | |
| download | googletest-03be5df17cc7e377a2cad4e110f2f6270d212eb9.tar.gz googletest-03be5df17cc7e377a2cad4e110f2f6270d212eb9.tar.bz2 googletest-03be5df17cc7e377a2cad4e110f2f6270d212eb9.zip | |
cont.
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 2ae94df2..71892126 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -51,7 +51,7 @@ // Silence C4800 (C4800: 'int *const ': forcing value // to bool 'true' or 'false') for MSVC 14 -#ifdef _MSC_VER && _MSC_VER == 1900 +#ifdef (_MSC_VER && _MSC_VER == 1900) # pragma warning(push) # pragma warning(disable:4800) #endif @@ -874,6 +874,6 @@ InSequence::~InSequence() { } // namespace testing -#ifdef _MSC_VER && _MSC_VER == 1900 +#ifdef (_MSC_VER && _MSC_VER == 1900) # pragma warning(pop) #endif |