summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2011-04-26 11:41:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-26 11:41:31 -0700
commitbb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930 (patch)
tree127f3d9a5b159669b2bf75f09fd8c24ac03296d5
parent45e13ec1c5cd765162b7450b1c3a4632e8979894 (diff)
parentbb10986c3d7493eaa3cd16042c8e6dae4769a071 (diff)
downloadframeworks_base-bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930.zip
frameworks_base-bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930.tar.gz
frameworks_base-bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930.tar.bz2
am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071': libutils: Fix an improper const-cast in RefBase
-rw-r--r--libs/utils/RefBase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/utils/RefBase.cpp b/libs/utils/RefBase.cpp
index 0bd1af4..d28b751 100644
--- a/libs/utils/RefBase.cpp
+++ b/libs/utils/RefBase.cpp
@@ -480,7 +480,7 @@ void RefBase::weakref_type::printRefs() const
void RefBase::weakref_type::trackMe(bool enable, bool retain)
{
- static_cast<const weakref_impl*>(this)->trackMe(enable, retain);
+ static_cast<weakref_impl*>(this)->trackMe(enable, retain);
}
RefBase::weakref_type* RefBase::createWeak(const void* id) const