summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2011-04-26 12:46:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-26 12:46:04 -0700
commit87dfce43075e933972b42a0071329b112af33bef (patch)
tree81f1a14f57474ee7bf19061073b2b8fd06f7f4d2
parentb7642cbae40aa6b1c54e5b39ed046f7f52e327d9 (diff)
parentfbb0e9f9846e185ba8ded63d754c4e61b1499b90 (diff)
downloadframeworks_base-87dfce43075e933972b42a0071329b112af33bef.zip
frameworks_base-87dfce43075e933972b42a0071329b112af33bef.tar.gz
frameworks_base-87dfce43075e933972b42a0071329b112af33bef.tar.bz2
am fbb0e9f9: am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit 'fbb0e9f9846e185ba8ded63d754c4e61b1499b90': 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 bb6c125..2034486 100644
--- a/libs/utils/RefBase.cpp
+++ b/libs/utils/RefBase.cpp
@@ -524,7 +524,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