Commit: b40d69b3637487ecc48c26906d949995360ef625 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Révision: b40d69b3637487ecc48c26906d949995360ef625 (tree)
• l'heure: 2011-06-10 23:44:01
• Auteur: Josh Stone <cuviper@gmai...>
• Commiter: Chih-Wei Huang

Message de Log

libutils: Fix an improper const-cast in RefBase

Under Fedora 15 Beta, gcc 4.6.0 warns:

frameworks/base/libs/utils/RefBase.cpp: In member function

‘void android::RefBase::weakref_type::trackMe(bool, bool)’:

frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing

‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]

trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.

Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c

Change Summary

• modified: libs/utils/RefBase.cpp

Modification

--- 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