Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aab3b34c authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '4c818dc8':
  RefBase: make Renamer destructor virtual
parents 0fd33562 4c818dc8

include/utils/RefBase.h

+4 −2
Original line number Diff line number Diff line
@@ -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>));