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

* commit '4c818dc800d97e2fdee0337a0e9736099d90cc47':
  RefBase: make Renamer destructor virtual
This commit is contained in:
Elliott Hughes 2014-08-06 22:48:30 +00:00 committed by Android Git Automerger
commit aab3b34cd7

View file

@ -491,7 +491,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>));
@ -510,7 +511,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>));