diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 10:43:11 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 10:43:11 -0400 |
| commit | 32ac9492544cf099859492038093cd5819056946 (patch) | |
| tree | b217741be38cd9e7194e5d9a4e2324ff227cf5ca /googlemock/include/gmock/internal/gmock-internal-utils.h | |
| parent | 1831ac93611ab478e8bbaf0f6ce8048fd9560835 (diff) | |
| download | googletest-32ac9492544cf099859492038093cd5819056946.tar.gz googletest-32ac9492544cf099859492038093cd5819056946.tar.bz2 googletest-32ac9492544cf099859492038093cd5819056946.zip | |
cont
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
| -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 76df2e57..7f761344 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 4805;) #endif // Joins a vector of strings as if they are fields of a tuple; returns |