diff options
| author | Al Sutton <al@funkyandroid.com> | 2012-02-19 08:31:19 +0000 |
|---|---|---|
| committer | Al Sutton <al@funkyandroid.com> | 2012-02-19 08:31:19 +0000 |
| commit | 7a4d92af9bdcf94d770bfa8313ad5b21c829ed96 (patch) | |
| tree | 547b7020c3b87ee0f011ff4227f4e64b6d0b5aa7 | |
| parent | 44c1f012c4ffa75853a068963b212ee1c965b6ea (diff) | |
| download | frameworks_base-7a4d92af9bdcf94d770bfa8313ad5b21c829ed96.zip frameworks_base-7a4d92af9bdcf94d770bfa8313ad5b21c829ed96.tar.gz frameworks_base-7a4d92af9bdcf94d770bfa8313ad5b21c829ed96.tar.bz2 | |
Xcode 4.3 compatibility checkin
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases
Signed-off-by: Al Sutton <al@funkyandroid.com>
| -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 6bcdea4..65165a2 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; } |