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

Commit 92dc2327 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Drop const assignment operator." am: d0e499f2 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2640836



Change-Id: I1185c00bf2c8672a67e1e84dd8b262132b327497
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42cc9100 d0e499f2

libutils/include/utils/Vector.h

+12 −24
Original line number Diff line number Diff line
@@ -67,11 +67,8 @@ public: 
    virtual                 ~Vector();



    /*! copy operator */

            const Vector<TYPE>&     operator = (const Vector<TYPE>& rhs) const;

            Vector<TYPE>&           operator = (const Vector<TYPE>& rhs);



            const Vector<TYPE>&     operator = (const SortedVector<TYPE>& rhs) const;

            Vector<TYPE>&           operator = (const SortedVector<TYPE>& rhs);

    Vector<TYPE>& operator=(const Vector<TYPE>& rhs);        // NOLINT(cert-oop54-cpp)

    Vector<TYPE>& operator=(const SortedVector<TYPE>& rhs);  // NOLINT(cert-oop54-cpp)



    /*

     * empty the vector
@@ -248,30 +245,21 @@ Vector<TYPE>::~Vector() { 
    finish_vector();

}



template<class TYPE> inline

Vector<TYPE>& Vector<TYPE>::operator = (const Vector<TYPE>& rhs) {

template <class TYPE>

inline Vector<TYPE>& Vector<TYPE>::operator=(const Vector<TYPE>& rhs)  // NOLINT(cert-oop54-cpp)

{

    VectorImpl::operator=(rhs);

    return *this;

}



template<class TYPE> inline

const Vector<TYPE>& Vector<TYPE>::operator = (const Vector<TYPE>& rhs) const {

    VectorImpl::operator = (static_cast<const VectorImpl&>(rhs));

    return *this;

}



template<class TYPE> inline

Vector<TYPE>& Vector<TYPE>::operator = (const SortedVector<TYPE>& rhs) {

template <class TYPE>

inline Vector<TYPE>& Vector<TYPE>::operator=(

        const SortedVector<TYPE>& rhs)  // NOLINT(cert-oop54-cpp)

{

    VectorImpl::operator=(static_cast<const VectorImpl&>(rhs));

    return *this;

}



template<class TYPE> inline

const Vector<TYPE>& Vector<TYPE>::operator = (const SortedVector<TYPE>& rhs) const {

    VectorImpl::operator = (rhs);

    return *this;

}



template<class TYPE> inline

const TYPE* Vector<TYPE>::array() const {

    return static_cast<const TYPE *>(arrayImpl());