diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 10:25:59 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 10:25:59 -0400 |
| commit | 35a709a701cbebfcc685e35d0732dca10bac7763 (patch) | |
| tree | 8b1105f8f3cbaa5274bd4dbe968cc587b26d8404 /googlemock/src | |
| parent | 61e8a0b10b800ab527ecd19f913b2f6c850db541 (diff) | |
| download | googletest-35a709a701cbebfcc685e35d0732dca10bac7763.tar.gz googletest-35a709a701cbebfcc685e35d0732dca10bac7763.tar.bz2 googletest-35a709a701cbebfcc685e35d0732dca10bac7763.zip | |
preproc syntax ( I can never remember it)
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 8f8a2d7e..c8241c3d 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -51,9 +51,11 @@ // Silence C4800 (C4800: 'int *const ': forcing value // to bool 'true' or 'false') for MSVC 14 -#ifdef _MSC_VER && (_MSC_VER == 1900) -# pragma warning(push) -# pragma warning(disable:4800) +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(push) +# pragma warning(disable:4800) +#endif #endif namespace testing { @@ -874,6 +876,8 @@ InSequence::~InSequence() { } // namespace testing -#ifdef _MSC_VER && (_MSC_VER == 1900) -# pragma warning(pop) +#ifdef _MSC_VER +#if _MSC_VER == 1900 +# pragma warning(pop) +#endif #endif |