Back out 39bcc4b7efc8+e268996cb988 (bug 912299) for Android build bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 05 Sep 2013 21:40:01 -0700
changeset 145860 98656b5a9e6b0ebd93e4967ab9200a926ed293c9
parent 145859 c6412aa5cc28aefdc926a878dde03493f59efceb
child 145861 c9985bea4d215c7acbac2e1e7ec34f2e2b75d878
push id2524
push useremorley@mozilla.com
push dateFri, 06 Sep 2013 15:26:16 +0000
treeherderfx-team@802f4d5b7106 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs912299
milestone26.0a1
backs out39bcc4b7efc8e3a0b36508e501750f1859dd4426
Back out 39bcc4b7efc8+e268996cb988 (bug 912299) for Android build bustage
mfbt/RefPtr.h
mozglue/linker/ElfLoader.h
--- a/mfbt/RefPtr.h
+++ b/mfbt/RefPtr.h
@@ -63,42 +63,42 @@ class RefCounted
   protected:
     RefCounted() : refCnt(0) { }
     ~RefCounted() {
       MOZ_ASSERT(refCnt == detail::DEAD);
     }
 
   public:
     // Compatibility with nsRefPtr.
-    void AddRef() const {
+    void AddRef() {
       MOZ_ASSERT(refCnt >= 0);
       ++refCnt;
     }
 
-    void Release() const {
+    void Release() {
       MOZ_ASSERT(refCnt > 0);
       if (0 == --refCnt) {
 #ifdef DEBUG
         refCnt = detail::DEAD;
 #endif
-        delete static_cast<const T*>(this);
+        delete static_cast<T*>(this);
       }
     }
 
     // Compatibility with wtf::RefPtr.
     void ref() { AddRef(); }
     void deref() { Release(); }
     int refCount() const { return refCnt; }
     bool hasOneRef() const {
       MOZ_ASSERT(refCnt > 0);
       return refCnt == 1;
     }
 
   private:
-    mutable typename Conditional<Atomicity == AtomicRefCount, Atomic<int>, int>::Type refCnt;
+    typename Conditional<Atomicity == AtomicRefCount, Atomic<int>, int>::Type refCnt;
 };
 
 }
 
 template<typename T>
 class RefCounted : public detail::RefCounted<T, detail::NonAtomicRefCount>
 {
   public:
--- a/mozglue/linker/ElfLoader.h
+++ b/mozglue/linker/ElfLoader.h
@@ -65,17 +65,17 @@ IsSignalHandlingBroken();
  * RefCounted<LibHandle>::Release to support some reentrancy. See further
  * below.
  */
 class LibHandle;
 
 namespace mozilla {
 namespace detail {
 
-template <> inline void RefCounted<LibHandle, AtomicRefCount>::Release() const;
+template <> inline void RefCounted<LibHandle, AtomicRefCount>::Release();
 
 template <> inline RefCounted<LibHandle, AtomicRefCount>::~RefCounted()
 {
   MOZ_ASSERT(refCnt == 0x7fffdead);
 }
 
 } /* namespace detail */
 } /* namespace mozilla */
@@ -210,17 +210,17 @@ private:
  * to 1 on normal builds, and 0x7fffdead on debug builds so that the LibHandle
  * can still be referenced while the destructor is executing. The refCnt is
  * allowed to grow > 0x7fffdead, but not to decrease under that value, which
  * would mean too many Releases from within the destructor.
  */
 namespace mozilla {
 namespace detail {
 
-template <> inline void RefCounted<LibHandle, AtomicRefCount>::Release() const {
+template <> inline void RefCounted<LibHandle, AtomicRefCount>::Release() {
 #ifdef DEBUG
   if (refCnt > 0x7fff0000)
     MOZ_ASSERT(refCnt > 0x7fffdead);
 #endif
   MOZ_ASSERT(refCnt > 0);
   if (refCnt > 0) {
     if (0 == --refCnt) {
 #ifdef DEBUG