diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 10:35:09 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 10:35:09 -0400 |
| commit | 1831ac93611ab478e8bbaf0f6ce8048fd9560835 (patch) | |
| tree | f1574044c76821c7dda24e51c2a3a476670e3bde /googlemock/include | |
| parent | eb3e4aac2e7f740a207f2bb3207cb925b9270c0e (diff) | |
| download | googletest-1831ac93611ab478e8bbaf0f6ce8048fd9560835.tar.gz googletest-1831ac93611ab478e8bbaf0f6ce8048fd9560835.tar.bz2 googletest-1831ac93611ab478e8bbaf0f6ce8048fd9560835.zip | |
more warnings
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 29b69926..76df2e57 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -52,7 +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 C4805) +# pragma warning(disable: 4100, C4805) #endif // Joins a vector of strings as if they are fields of a tuple; returns |