зеркало из https://github.com/mozilla/gecko-dev.git
50 строки
1.3 KiB
Diff
50 строки
1.3 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Wed, 18 Nov 2020 13:33:00 -0500
|
|
Subject: Bug 1654112 - Suppress -Wclass-varargs warning in logging.h. r=ng
|
|
|
|
This needs some investigation to see why we get this warning when it is not
|
|
present upstream.
|
|
|
|
Since both were doing the same thing for different compiler chains,
|
|
also includes:
|
|
Bug 1654112 - linux build fix (pragmas) for base-toolchains* . r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D130086
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8d832e832ffe513246c0763a56376a8022b2447b
|
|
---
|
|
rtc_base/logging.h | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/rtc_base/logging.h b/rtc_base/logging.h
|
|
index 8f490c44a2..9340fe2c55 100644
|
|
--- a/rtc_base/logging.h
|
|
+++ b/rtc_base/logging.h
|
|
@@ -48,6 +48,14 @@
|
|
#ifndef RTC_BASE_LOGGING_H_
|
|
#define RTC_BASE_LOGGING_H_
|
|
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wvarargs"
|
|
+
|
|
+#if defined(__clang__)
|
|
+# pragma clang diagnostic push
|
|
+# pragma clang diagnostic ignored "-Wclass-varargs"
|
|
+#endif
|
|
+
|
|
#include <errno.h>
|
|
|
|
#include <atomic>
|
|
@@ -769,4 +777,9 @@ inline const char* AdaptString(const std::string& str) {
|
|
|
|
} // namespace rtc
|
|
|
|
+#pragma GCC diagnostic pop
|
|
+#if defined(__clang__)
|
|
+# pragma clang diagnostic pop
|
|
+#endif
|
|
+
|
|
#endif // RTC_BASE_LOGGING_H_
|
|
--
|
|
2.34.1
|
|
|