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

Commit 04075569 authored by Dave Burke's avatar Dave Burke Committed by Android (Google) Code Review
Browse files

Revert "Revert "put back the unused virtuals in Vector<>"" 

This reverts commit 225c66a4

Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
parent d17e3b5f

include/utils/VectorImpl.h

+20 −0
Original line number Original line Diff line number Diff line
@@ -105,6 +105,16 @@ protected: 
    virtual void            do_move_forward(void* dest, const void* from, size_t num) const = 0;

    virtual void            do_move_forward(void* dest, const void* from, size_t num) const = 0;

    virtual void            do_move_backward(void* dest, const void* from, size_t num) const = 0;

    virtual void            do_move_backward(void* dest, const void* from, size_t num) const = 0;





    // take care of FBC...

    virtual void            reservedVectorImpl1();

    virtual void            reservedVectorImpl2();

    virtual void            reservedVectorImpl3();

    virtual void            reservedVectorImpl4();

    virtual void            reservedVectorImpl5();

    virtual void            reservedVectorImpl6();

    virtual void            reservedVectorImpl7();

    virtual void            reservedVectorImpl8();

    

private:

private:

        void* _grow(size_t where, size_t amount);

        void* _grow(size_t where, size_t amount);

        void  _shrink(size_t where, size_t amount);

        void  _shrink(size_t where, size_t amount);
@@ -155,6 +165,16 @@ public: 
protected:

protected:

    virtual int             do_compare(const void* lhs, const void* rhs) const = 0;

    virtual int             do_compare(const void* lhs, const void* rhs) const = 0;





    // take care of FBC...

    virtual void            reservedSortedVectorImpl1();

    virtual void            reservedSortedVectorImpl2();

    virtual void            reservedSortedVectorImpl3();

    virtual void            reservedSortedVectorImpl4();

    virtual void            reservedSortedVectorImpl5();

    virtual void            reservedSortedVectorImpl6();

    virtual void            reservedSortedVectorImpl7();

    virtual void            reservedSortedVectorImpl8();



private:

private:

            ssize_t         _indexOrderOf(const void* item, size_t* order = 0) const;

            ssize_t         _indexOrderOf(const void* item, size_t* order = 0) const;

libs/utils/VectorImpl.cpp

+19 −0
Original line number Original line Diff line number Diff line
@@ -494,6 +494,15 @@ void VectorImpl::_do_move_backward(void* dest, const void* from, size_t num) con 
    do_move_backward(dest, from, num);

    do_move_backward(dest, from, num);

}

}





void VectorImpl::reservedVectorImpl1() { }

void VectorImpl::reservedVectorImpl2() { }

void VectorImpl::reservedVectorImpl3() { }

void VectorImpl::reservedVectorImpl4() { }

void VectorImpl::reservedVectorImpl5() { }

void VectorImpl::reservedVectorImpl6() { }

void VectorImpl::reservedVectorImpl7() { }

void VectorImpl::reservedVectorImpl8() { }



/*****************************************************************************/

/*****************************************************************************/





SortedVectorImpl::SortedVectorImpl(size_t itemSize, uint32_t flags)

SortedVectorImpl::SortedVectorImpl(size_t itemSize, uint32_t flags)
@@ -609,6 +618,16 @@ ssize_t SortedVectorImpl::remove(const void* item) 
    return i;

    return i;

}

}





void SortedVectorImpl::reservedSortedVectorImpl1() { };

void SortedVectorImpl::reservedSortedVectorImpl2() { };

void SortedVectorImpl::reservedSortedVectorImpl3() { };

void SortedVectorImpl::reservedSortedVectorImpl4() { };

void SortedVectorImpl::reservedSortedVectorImpl5() { };

void SortedVectorImpl::reservedSortedVectorImpl6() { };

void SortedVectorImpl::reservedSortedVectorImpl7() { };

void SortedVectorImpl::reservedSortedVectorImpl8() { };





/*****************************************************************************/

/*****************************************************************************/





}; // namespace android

}; // namespace android