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

Commit 7a4d92af authored by Al Sutton's avatar Al Sutton
Browse files

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: default avatarAl Sutton <al@funkyandroid.com>
parent 44c1f012

include/utils/KeyedVector.h

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

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;

}

}