summaryrefslogtreecommitdiffstats
path: root/third_party/googletest/operator_comma_warning.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 17:32:43 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 17:32:43 +0000
commit6bf0a5cb5034a7e684dcc3500e841785237ce2dd (patch)
treea68f146d7fa01f0134297619fbe7e33db084e0aa /third_party/googletest/operator_comma_warning.patch
parentInitial commit. (diff)
downloadthunderbird-upstream.tar.xz
thunderbird-upstream.zip
Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/googletest/operator_comma_warning.patch')
-rw-r--r--third_party/googletest/operator_comma_warning.patch12
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 << ") ";
+ }