commit db22493c08c0f96b8e685eed8e807710c7013e81
author Yi Kong <yikong@google.com> Tue Mar 19 18:37:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 18:37:43 2019 +0000
tree ab065405437c33d61066d965848d946fc2f8ce94
parent 4003637a6115c18c05a1969fd2420195e080c4e9
parent 734bb12f6371921b51453f164c2c383f6e0f8189

Merge "Suppress -Wstring-plus-int warning"

liblog/logger_write.cpp

diff --git a/liblog/logger_write.cpp b/liblog/logger_write.cpp
index 908fe7f..7fa3f43 100644
--- a/liblog/logger_write.cpp
+++ b/liblog/logger_write.cpp
@@ -413,6 +413,8 @@
   if (!tag) tag = "";
 
   /* XXX: This needs to go! */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstring-plus-int"
   if (bufID != LOG_ID_RADIO) {
     switch (tag[0]) {
       case 'H':
@@ -454,6 +456,7 @@
         break;
     }
   }
+#pragma clang diagnostic pop
 
 #if __BIONIC__
   if (prio == ANDROID_LOG_FATAL) {