diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 15:00:13 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 15:00:13 (GMT) |
| commit | c75b76e20ae06e506ef72a3339208f14fd376493 (patch) | |
| tree | 7594719690bc8404c152c440dd5872966399ea34 /googlemock/include/gmock/internal/gmock-internal-utils.h | |
| parent | 04e31881fcc21a23b552584062b672055fb288c0 (diff) | |
| download | googletest-c75b76e20ae06e506ef72a3339208f14fd376493.zip googletest-c75b76e20ae06e506ef72a3339208f14fd376493.tar.gz googletest-c75b76e20ae06e506ef72a3339208f14fd376493.tar.bz2 | |
warnings
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 00c6cc3..ef150e0 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -52,7 +52,8 @@ namespace internal { // C4805('==': unsafe mix of type 'const int' and type 'const bool') #ifdef _MSC_VER # pragma warning(push) -# pragma warning(disable:4100 4805;) +# pragma warning(disable:4100) +# pragma warning(disable:4805) #endif // Joins a vector of strings as if they are fields of a tuple; returns |