From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Tue, 22 Mar 2022 22:50:07 +0000 (+0000)
Subject: remove clang-ism
X-Git-Tag: archive/raspbian/29.0.6-18+rpi1~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d25beb62fc8719ca8c6a5b54c20b179867db5e5;p=android-platform-tools.git

remove clang-ism

Forwarded: not-needed


Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-attribute-issue-with-gcc.patch
---

diff --git a/system/core/base/include/android-base/logging.h b/system/core/base/include/android-base/logging.h
index accc225d..40a0d6d7 100644
--- a/system/core/base/include/android-base/logging.h
+++ b/system/core/base/include/android-base/logging.h
@@ -451,10 +451,7 @@ namespace std {  // NOLINT(cert-dcl58-cpp)
 //       -Wno-user-defined-warnings to CPPFLAGS.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
-#define OSTREAM_STRING_POINTER_USAGE_WARNING \
-    __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning")))
-inline OSTREAM_STRING_POINTER_USAGE_WARNING
-std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) {
+inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) {
   return stream << static_cast<const void*>(string_pointer);
 }
 #pragma clang diagnostic pop