summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2011-04-26 11:32:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-26 11:32:22 -0700
commitbb10986c3d7493eaa3cd16042c8e6dae4769a071 (patch)
treed5762b2a7c5539edccef31bbeac72194803383e4
parent5fcfce965f1380ee7e151c1df75b247dd42b349e (diff)
parent13ce221e4316f7956ba072e774a7b97646e5d99b (diff)
downloadframeworks_base-bb10986c3d7493eaa3cd16042c8e6dae4769a071.zip
frameworks_base-bb10986c3d7493eaa3cd16042c8e6dae4769a071.tar.gz
frameworks_base-bb10986c3d7493eaa3cd16042c8e6dae4769a071.tar.bz2
am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '13ce221e4316f7956ba072e774a7b97646e5d99b': 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