diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-06 22:44:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 22:44:38 +0000 |
| commit | 4c818dc800d97e2fdee0337a0e9736099d90cc47 (patch) | |
| tree | 4a25f62c7ca1891096e9032d781792f81f268d54 | |
| parent | 5d2283927a9527130cad15d33c1e2b360f4bd46f (diff) | |
| parent | 56b28f6b2c4722c75dbc7f041f36552221e51133 (diff) | |
| download | system_core-4c818dc800d97e2fdee0337a0e9736099d90cc47.zip system_core-4c818dc800d97e2fdee0337a0e9736099d90cc47.tar.gz system_core-4c818dc800d97e2fdee0337a0e9736099d90cc47.tar.bz2 | |
am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
* commit '56b28f6b2c4722c75dbc7f041f36552221e51133':
RefBase: make Renamer destructor virtual
| -rw-r--r-- | include/utils/RefBase.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h index cbfe13a..ac1ac6c 100644 --- a/include/utils/RefBase.h +++ b/include/utils/RefBase.h @@ -484,7 +484,8 @@ public: 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>)); @@ -503,7 +504,8 @@ public: 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>)); |