diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-02-16 14:45:00 +0059 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-03-29 09:41:16 +0200 |
| commit | 385e2b088ed4d89c018e8ed3b580319b097c48db (patch) | |
| tree | 319c1236e62e3905aeee2c9dad1d8b1992633823 | |
| parent | 619ec06acb242383ca462a88d4bb09748e72fa44 (diff) | |
| download | base-385e2b088ed4d89c018e8ed3b580319b097c48db.tar.gz | |
frameworks/base: gcc 4.7 compile fixes
Make sure we can compile even with gcc 4.7's added
strictness
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | include/utils/KeyedVector.h | 2 | ||||
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/utils/KeyedVector.h b/include/utils/KeyedVector.h index 6bcdea4ff182..5e627557d64d 100644 --- a/include/utils/KeyedVector.h +++ b/include/utils/KeyedVector.h @@ -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; } diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 6096b721ea6e..6fbdddac0870 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -514,16 +514,16 @@ void MediaProfiles::checkAndAddRequiredProfilesIfNecessary() { // Check high and low from either camcorder profile or timelapse profile // but not both. Default, check camcorder profile size_t j = 0; - size_t n = 2; + size_t n_ = 2; if (isTimelapseProfile(quality)) { // Check timelapse profile instead. j = 2; - n = kNumRequiredProfiles; + n_ = kNumRequiredProfiles; } else { // Must be camcorder profile. CHECK(isCamcorderProfile(quality)); } - for (; j < n; ++j) { + for (; j < n_; ++j) { info = &(mRequiredProfileRefs[refIndex].mRefs[j]); if ((j % 2 == 0 && product > info->mResolutionProduct) || // low (j % 2 != 0 && product < info->mResolutionProduct)) { // high |