diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 14:24:49 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 14:24:49 (GMT) |
| commit | eb3e4aac2e7f740a207f2bb3207cb925b9270c0e (patch) | |
| tree | 12e92ea0935183309cea12e6548f532adf42a2d3 /googlemock | |
| parent | 50c0bcd7e36374d6c3d0359c2160d8493e67527e (diff) | |
| download | googletest-eb3e4aac2e7f740a207f2bb3207cb925b9270c0e.zip googletest-eb3e4aac2e7f740a207f2bb3207cb925b9270c0e.tar.gz googletest-eb3e4aac2e7f740a207f2bb3207cb925b9270c0e.tar.bz2 | |
deal with MSVC warn, cont 1
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 85becb5..29b6992 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -52,8 +52,7 @@ namespace internal { // C4805('==': unsafe mix of type 'const int' and type 'const bool') #ifdef _MSC_VER # pragma warning(push) -# pragma warning(disable:4100) -# pragma warning(disable:C4805) +# pragma warning(disable: 4100 C4805) #endif // Joins a vector of strings as if they are fields of a tuple; returns |