Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd16dd1b authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin" 

* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
  Xcode 4.3 compatibility checkin
parents 98c14afd b297356a

include/utils/KeyedVector.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

}