Merge "GCC 4.7 now correctly implements the two-phase name lookup rules" into ics (9a525e0d) · Commits · e / os / android_frameworks_base

include/utils/KeyedVector.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ DefaultKeyedVector<KEY,VALUE>::DefaultKeyedVector(const VALUE& defValue)

		template<typename KEY, typename VALUE> inline
		const VALUE& DefaultKeyedVector<KEY,VALUE>::valueFor(const KEY& key) const {
		ssize_t i = indexOfKey(key);
		ssize_t i = this->indexOfKey(key);
		return i >= 0 ? KeyedVector<KEY,VALUE>::valueAt(i) : mDefault;
		}