diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-06 22:38:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-05 00:30:25 +0000 |
| commit | 56b28f6b2c4722c75dbc7f041f36552221e51133 (patch) | |
| tree | 366adee7ee490acff0a3b1c053dbde17bc67bb88 /include | |
| parent | d24240fb4fea5b1b2776f6b7e5e632ef8d21e978 (diff) | |
| parent | 00e56a248dd214555d9d0fda9d0f064e8d23e9cf (diff) | |
| download | system_core-56b28f6b2c4722c75dbc7f041f36552221e51133.zip system_core-56b28f6b2c4722c75dbc7f041f36552221e51133.tar.gz system_core-56b28f6b2c4722c75dbc7f041f36552221e51133.tar.bz2 | |
Merge "RefBase: make Renamer destructor virtual"
Diffstat (limited to 'include')
| -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>)); |