diff options
Diffstat (limited to 'third_party/googletest/operator_comma_warning.patch')
| -rw-r--r-- | third_party/googletest/operator_comma_warning.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/third_party/googletest/operator_comma_warning.patch b/third_party/googletest/operator_comma_warning.patch new file mode 100644 index 0000000000..b29506563a --- /dev/null +++ b/third_party/googletest/operator_comma_warning.patch @@ -0,0 +1,12 @@ +diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h +--- a/googlemock/include/gmock/gmock-matchers.h ++++ b/googlemock/include/gmock/gmock-matchers.h +@@ -3932,7 +3932,7 @@ class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> { + const char* sep = ""; + // Workaround spurious C4189 on MSVC<=15.7 when k is empty. + (void)sep; +- const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...}; ++ const char* dummy[] = {"", (static_cast<void>(*os << sep << "#" << k), sep = ", ")...}; + (void)dummy; + *os << ") "; + } |