summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/internal/gmock-internal-utils.h
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-06 14:43:11 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-06 14:43:11 (GMT)
commit32ac9492544cf099859492038093cd5819056946 (patch)
treeb217741be38cd9e7194e5d9a4e2324ff227cf5ca /googlemock/include/gmock/internal/gmock-internal-utils.h
parent1831ac93611ab478e8bbaf0f6ce8048fd9560835 (diff)
downloadgoogletest-32ac9492544cf099859492038093cd5819056946.zip
googletest-32ac9492544cf099859492038093cd5819056946.tar.gz
googletest-32ac9492544cf099859492038093cd5819056946.tar.bz2
cont
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h2
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 76df2e5..7f76134 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