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

Commit 9afddd8d authored by Daniel Hillenbrand's avatar Daniel Hillenbrand Committed by Gerrit Code Review
Browse files

Merge "libutils: refbase: jellybean mr1 compat" into cm-10.2

parents 0b770ca9 b059a1ff

include/utils/RefBase.h

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ inline bool operator _op_ (const U* o) const { \ 


// ---------------------------------------------------------------------------



/* START JB MR1 COMPAT */

class ReferenceConverterBase {

public:

    virtual size_t getReferenceTypeSize() const = 0;

    virtual void* getReferenceBase(void const*) const = 0;

    inline virtual ~ReferenceConverterBase() { }

};

/* END JB MR1 COMPAT */



class ReferenceRenamer {

protected:

    // destructor is purposedly not virtual so we avoid code overhead from

libs/utils/RefBase.cpp

+7 −0
Original line number Diff line number Diff line
@@ -627,6 +627,13 @@ void RefBase::onLastWeakRef(const void* /*id*/) 


// ---------------------------------------------------------------------------



/* START JB MR1 COMPAT */

extern "C" void _ZN7android7RefBase14moveReferencesEPvPKvjRKNS_22ReferenceConverterBaseE(void* dst, void const* src, size_t n,

        const ReferenceConverterBase& caster)

{

}

/* END JB MR1 COMPAT */



void RefBase::renameRefs(size_t n, const ReferenceRenamer& renamer) {

#if DEBUG_REFS

    for (size_t i=0 ; i<n ; i++) {