diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-23 12:22:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 12:22:35 -0800 |
| commit | 6822c97898ef6c73528d17beb161059e5032f34a (patch) | |
| tree | 22281d2edf52465ecc2ae33e83d6f0fb1d29f4be | |
| parent | afb902be6710d240bec3d98bd81d97dfb286ffdb (diff) | |
| parent | 32916f7a22f2abf5c1e7021f44c2337ca172f2e5 (diff) | |
| download | frameworks_base-6822c97898ef6c73528d17beb161059e5032f34a.zip frameworks_base-6822c97898ef6c73528d17beb161059e5032f34a.tar.gz frameworks_base-6822c97898ef6c73528d17beb161059e5032f34a.tar.bz2 | |
am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"
* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
Xcode 4.3 compatibility checkin
| -rw-r--r-- | include/utils/KeyedVector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/utils/KeyedVector.h b/include/utils/KeyedVector.h index fcc3bcf..85535bd 100644 --- a/include/utils/KeyedVector.h +++ b/include/utils/KeyedVector.h @@ -122,7 +122,7 @@ ssize_t KeyedVector<KEY,VALUE>::indexOfKey(const KEY& key) const { template<typename KEY, typename VALUE> inline const VALUE& KeyedVector<KEY,VALUE>::valueFor(const KEY& key) const { - ssize_t i = indexOfKey(key); + ssize_t i = this->indexOfKey(key); assert(i>=0); return mVector.itemAt(i).value; } @@ -139,7 +139,7 @@ const KEY& KeyedVector<KEY,VALUE>::keyAt(size_t index) const { template<typename KEY, typename VALUE> inline VALUE& KeyedVector<KEY,VALUE>::editValueFor(const KEY& key) { - ssize_t i = indexOfKey(key); + ssize_t i = this->indexOfKey(key); assert(i>=0); return mVector.editItemAt(i).value; } @@ -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; } |