diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-23 22:31:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 22:31:24 +0000 |
| commit | 7aa8cdfb317dcb7efb7127b070526df09da05377 (patch) | |
| tree | 799a71da135d26b751317876cf99e482033702cb /include/utils | |
| parent | c37297f3318617849e5930870afb18bbaf91ddb5 (diff) | |
| parent | 21157abcd932e899032689dba120d4f7cb08aa23 (diff) | |
| download | system_core-7aa8cdfb317dcb7efb7127b070526df09da05377.zip system_core-7aa8cdfb317dcb7efb7127b070526df09da05377.tar.gz system_core-7aa8cdfb317dcb7efb7127b070526df09da05377.tar.bz2 | |
am 21157abc: am 8814bd1d: Merge "include: cleanup for -Wsystem-header"
* commit '21157abcd932e899032689dba120d4f7cb08aa23':
include: cleanup for -Wsystem-header
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/Functor.h | 2 | ||||
| -rw-r--r-- | include/utils/LruCache.h | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/utils/Functor.h b/include/utils/Functor.h index e24ded4..09ea614 100644 --- a/include/utils/Functor.h +++ b/include/utils/Functor.h @@ -25,7 +25,7 @@ class Functor { public: Functor() {} virtual ~Functor() {} - virtual status_t operator ()(int what, void* data) { return NO_ERROR; } + virtual status_t operator ()(int /*what*/, void* /*data*/) { return NO_ERROR; } }; }; // namespace android diff --git a/include/utils/LruCache.h b/include/utils/LruCache.h index 053bfaf..9248ac9 100644 --- a/include/utils/LruCache.h +++ b/include/utils/LruCache.h @@ -56,7 +56,7 @@ public: bool next() { mIndex = mCache.mTable->next(mIndex); - return mIndex != -1; + return (ssize_t)mIndex != -1; } size_t index() const { @@ -103,9 +103,13 @@ private: // Implementation is here, because it's fully templated template <typename TKey, typename TValue> -LruCache<TKey, TValue>::LruCache(uint32_t maxCapacity): mMaxCapacity(maxCapacity), - mNullValue(NULL), mTable(new BasicHashtable<TKey, Entry>), mYoungest(NULL), mOldest(NULL), - mListener(NULL) { +LruCache<TKey, TValue>::LruCache(uint32_t maxCapacity) + : mTable(new BasicHashtable<TKey, Entry>) + , mListener(NULL) + , mOldest(NULL) + , mYoungest(NULL) + , mMaxCapacity(maxCapacity) + , mNullValue(NULL) { }; template<typename K, typename V> |