diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 14:08:12 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 14:08:12 (GMT) |
| commit | 61e8a0b10b800ab527ecd19f913b2f6c850db541 (patch) | |
| tree | 8501c7f3a647aaa7fafad7303b3ba30139a81498 /googlemock/src | |
| parent | 03be5df17cc7e377a2cad4e110f2f6270d212eb9 (diff) | |
| download | googletest-61e8a0b10b800ab527ecd19f913b2f6c850db541.zip googletest-61e8a0b10b800ab527ecd19f913b2f6c850db541.tar.gz googletest-61e8a0b10b800ab527ecd19f913b2f6c850db541.tar.bz2 | |
syntax
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 7189212..8f8a2d7 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 |