ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"

Browse Source 
* commit '2d03a93ecf00fb43272364293a21f88720884ce2':
  Xcode 4.3 compatibility checkin
This commit is contained in:
Jean-Baptiste Queru 2012-02-22 10:17:24 -08:00 committed by Android Git Automerger
commit 3eeb21dc44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/utils/KeyedVector.h
View File

@ -122,7 +122,7 @@ ssize_t KeyedVector<KEY,VALUE>::indexOfKey(const KEY& key) const {
template<typename KEY, typename VALUE> inline template<typename KEY, typename VALUE> inline
const VALUE& KeyedVector<KEY,VALUE>::valueFor(const KEY& key) const { const VALUE& KeyedVector<KEY,VALUE>::valueFor(const KEY& key) const {
ssize_t i = indexOfKey(key); ssize_t i = this->indexOfKey(key);
assert(i>=0); assert(i>=0);
return mVector.itemAt(i).value; 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 template<typename KEY, typename VALUE> inline
VALUE& KeyedVector<KEY,VALUE>::editValueFor(const KEY& key) { VALUE& KeyedVector<KEY,VALUE>::editValueFor(const KEY& key) {
ssize_t i = indexOfKey(key); ssize_t i = this->indexOfKey(key);
assert(i>=0); assert(i>=0);
return mVector.editItemAt(i).value; return mVector.editItemAt(i).value;
} }
@ -190,7 +190,7 @@ DefaultKeyedVector<KEY,VALUE>::DefaultKeyedVector(const VALUE& defValue)
template<typename KEY, typename VALUE> inline template<typename KEY, typename VALUE> inline
const VALUE& DefaultKeyedVector<KEY,VALUE>::valueFor(const KEY& key) const { 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; return i >= 0 ? KeyedVector<KEY,VALUE>::valueAt(i) : mDefault;
} }