commit 7d831769fce188251afb02e6b933be7bdfe504b4
author Chih-hung Hsieh <chh@google.com> Tue Nov 25 23:55:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 25 23:55:52 2014 +0000
tree 54bbad152e02526850566e9b50ec332f9bcf84ad
parent a7c75d1b17556d9842a7823c94a2c96982687c63
parent 46ca041f43e3d80029782b12c994b232dc01b5d5

am 46ca041f: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"

* commit '46ca041f43e3d80029782b12c994b232dc01b5d5':
  Don't error out because SensorEventConnection::dump overloads BBinder::dump

services/sensorservice/SensorService.h

diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h
index 8719487..e9ca3a5 100644
--- a/services/sensorservice/SensorService.h
+++ b/services/sensorservice/SensorService.h
@@ -37,6 +37,13 @@
 
 #include "SensorInterface.h"
 
+#if __clang__
+// Clang warns about SensorEventConnection::dump hiding BBinder::dump
+// The cause isn't fixable without changing the API, so let's tell clang
+// this is indeed intentional.
+#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#endif
+
 // ---------------------------------------------------------------------------
 
 #define DEBUG_CONNECTIONS   false