Merge "Drop const assignment operator." (d0e499f2) · Commits · e / os / android_system_core

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());