Silence gcc -Waddress warnings in logging.h

We were getting too many of these, poisoning our compile output.

Change-Id: Ic7e41e2bb538bf69a873e32217f87fd369317a20
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 9 insertions, 0 deletions

diff --git a/chromium/base/logging.h b/chromium/base/logging.h
index 1b97a4ab2ba..e7bf2e1920f 100644
--- a/chromium/base/logging.h
+++ b/chromium/base/logging.h
@@ -681,6 +681,11 @@ class CheckOpResult {
 
 #endif  // !(OFFICIAL_BUILD && NDEBUG)
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress"
+#endif // __GNUC__
+
 // This formats a value for a failing CHECK_XX statement.  Ordinarily,
 // it uses the definition for operator<<, with a few special cases below.
 template <typename T>
@@ -716,6 +721,10 @@ MakeCheckOpValueString(std::ostream* os, const T& v) {
   (*os) << static_cast<typename std::underlying_type<T>::type>(v);
 }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 // We need an explicit overload for std::nullptr_t.
 BASE_EXPORT void MakeCheckOpValueString(std::ostream* os, std::nullptr_t p);