commit aab3b34cd7b6243f30593fd2e4d6746866e797ef
author Elliott Hughes <enh@google.com> Wed Aug 06 22:48:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 06 22:48:30 2014 +0000
tree d85daf203f1e43dd445e13992d68a6bd3c19fdb3
parent 0fd33562d697c529262e7dc142f3e691316a4067
parent 4c818dc800d97e2fdee0337a0e9736099d90cc47

am 4c818dc8: am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"

* commit '4c818dc800d97e2fdee0337a0e9736099d90cc47':
  RefBase: make Renamer destructor virtual

include/utils/RefBase.h

diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h
index 8e15c19..eac6a78 100644
--- a/include/utils/RefBase.h
+++ b/include/utils/RefBase.h
@@ -491,7 +491,8 @@
                 TYPE::renameRefId(d[i].get(), &s[i], &d[i]);
             }
         public:
-            Renamer(sp<TYPE>* d, sp<TYPE> const* s) : s(s), d(d) { }
+            Renamer(sp<TYPE>* d, sp<TYPE> const* s) : d(d), s(s) { }
+            virtual ~Renamer() { }
         };
 
         memmove(d, s, n*sizeof(sp<TYPE>));
@@ -510,7 +511,8 @@
                 TYPE::renameRefId(d[i].get_refs(), &s[i], &d[i]);
             }
         public:
-            Renamer(wp<TYPE>* d, wp<TYPE> const* s) : s(s), d(d) { }
+            Renamer(wp<TYPE>* d, wp<TYPE> const* s) : d(d), s(s) { }
+            virtual ~Renamer() { }
         };
 
         memmove(d, s, n*sizeof(wp<TYPE>));