From 37e3dbf077f36409be3f615d75003fd980ee628a Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Fri, 28 Jan 2022 10:15:12 -0800 Subject: veux: Fix -Wbitwise-instead-of-logical Bug: http://b/215753485 This warning is introduced in clang-r445002. In code where the bitwise operation was used to avoid short-ciruit evaluation, make that explicit by introducing temporary variables. Test: build with clang-r445002. Change-Id: Ia7ccf1d48922d926313f691888d26c3e314c1056 --- gps/android/2.1/location_api/GnssAPIClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gps/android/2.1') diff --git a/gps/android/2.1/location_api/GnssAPIClient.cpp b/gps/android/2.1/location_api/GnssAPIClient.cpp index 07f617d..dcd6119 100644 --- a/gps/android/2.1/location_api/GnssAPIClient.cpp +++ b/gps/android/2.1/location_api/GnssAPIClient.cpp @@ -648,7 +648,7 @@ void GnssAPIClient::onGnssNmeaCb(GnssNmeaNotification gnssNmeaNotification) auto gnssCbIface_2_1(mGnssCbIface_2_1); mMutex.unlock(); - if (gnssCbIface != nullptr || gnssCbIface_2_0 != nullptr| gnssCbIface_2_1 != nullptr) { + if (gnssCbIface != nullptr || gnssCbIface_2_0 != nullptr|| gnssCbIface_2_1 != nullptr) { const std::string s(gnssNmeaNotification.nmea); std::stringstream ss(s); std::string each; -- cgit v1.2.3