summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-02-22 10:23:09 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-22 10:23:09 -0800
commit32916f7a22f2abf5c1e7021f44c2337ca172f2e5 (patch)
tree990d20fa87b3ed6faa573271c8f90a65b27e8f11
parent9f207a850f6c5744db895692f21159d9a88966c5 (diff)
parentfc4215eec9b947628c3ab5b3707711d16da19120 (diff)
am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"
* commit 'fc4215eec9b947628c3ab5b3707711d16da19120': Xcode 4.3 compatibility checkin
-rw-r--r--include/utils/KeyedVector.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/utils/KeyedVector.h b/include/utils/KeyedVector.h
index 6bcdea4ff182..65165a2c437c 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;
}