From f07f807b5ed57930232a2185971cab309886033b Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 13 Dec 2016 21:57:26 -0800 Subject: [PATCH] Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare The tautological-compare warning/error is uncovered when frameworks/av/include is moved from being a system header directory to a normal include directory. Test: m -j checkbuild Change-Id: Ie2d6c354f11e162416a1ac5e8ea185fa62a959a0 --- include/camera/CameraParameters2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/camera/CameraParameters2.h b/include/camera/CameraParameters2.h index 88ad8129b2..f691cd6ea0 100644 --- a/include/camera/CameraParameters2.h +++ b/include/camera/CameraParameters2.h @@ -151,7 +151,7 @@ private: } ssize_t removeItem(const KeyT& key) { - size_t vectorIdx = (size_t) indexOfKey(key); + ssize_t vectorIdx = indexOfKey(key); if (vectorIdx < 0) { return vectorIdx; -- 2.11.0