diff --git a/include/etl/array_view.h b/include/etl/array_view.h index 659a3a0e..b38d16af 100644 --- a/include/etl/array_view.h +++ b/include/etl/array_view.h @@ -486,335 +486,6 @@ namespace etl T* mend; }; - //*************************************************************************** - /// Constant array view. - //*************************************************************************** - template - class const_array_view - { - public: - - typedef T value_type; - typedef size_t size_type; - typedef const T& const_reference; - typedef const T* const_pointer; - typedef const T* const_iterator; - typedef std::reverse_iterator const_reverse_iterator; - - //************************************************************************* - /// Default constructor. - //************************************************************************* - ETL_CONSTEXPR const_array_view() - : mbegin(nullptr), - mend(nullptr) - { - } - - //************************************************************************* - /// Construct from std::array or etl::array or other type that supports - /// data() and size() member functions. - //************************************************************************* - template - ETL_CONSTEXPR explicit const_array_view(TArray& a) - : mbegin(a.data()), - mend(a.data() + a.size()) - { - } - - //************************************************************************* - /// Construct from iterators - //************************************************************************* - template - ETL_CONSTEXPR const_array_view(TIterator begin_, TIterator end_) - : mbegin(etl::addressof(*begin_)), - mend(etl::addressof(*begin_) + std::distance(begin_, end_)) - { - } - - //************************************************************************* - /// Construct from C array - //************************************************************************* - template - ETL_CONSTEXPR const_array_view(TIterator begin_, TSize size_) - : mbegin(etl::addressof(*begin_)), - mend(etl::addressof(*begin_) + size_) - { - } - - //************************************************************************* - /// Construct from C array - //************************************************************************* - template - ETL_CONSTEXPR explicit const_array_view(const T(&begin_)[ARRAY_SIZE]) - : mbegin(begin_), - mend(begin_ + ARRAY_SIZE) - { - } - - //************0************************************************************* - /// Copy constructor - //************************************************************************* - ETL_CONSTEXPR const_array_view(const array_view& other) - : mbegin(other.begin()), - mend(other.end()) - { - } - - //************************************************************************* - /// Copy constructor - //************************************************************************* - ETL_CONSTEXPR const_array_view(const const_array_view& other) - : mbegin(other.mbegin), - mend(other.mend) - { - } - - //************************************************************************* - /// Returns a const reference to the first element. - //************************************************************************* - const_reference front() const - { - return *mbegin; - } - - //************************************************************************* - /// Returns a const reference to the last element. - //************************************************************************* - const_reference back() const - { - return *(mend - 1); - } - - //************************************************************************* - /// Returns a const pointer to the first element of the internal storage. - //************************************************************************* - const_pointer data() const - { - return mbegin; - } - - //************************************************************************* - /// Returns a const iterator to the beginning of the array. - //************************************************************************* - const_iterator begin() const - { - return mbegin; - } - - //************************************************************************* - /// Returns a const iterator to the beginning of the array. - //************************************************************************* - const_iterator cbegin() const - { - return mbegin; - } - - //************************************************************************* - /// Returns a const iterator to the end of the array. - //************************************************************************* - const_iterator end() const - { - return mend; - } - - //************************************************************************* - // Returns a const iterator to the end of the array. - //************************************************************************* - const_iterator cend() const - { - return mend; - } - - //************************************************************************* - /// Returns a const reverse iterator to the reverse beginning of the array. - //************************************************************************* - const_reverse_iterator rbegin() const - { - return const_reverse_iterator(mend); - } - - //************************************************************************* - /// Returns a const reverse iterator to the reverse beginning of the array. - //************************************************************************* - const_reverse_iterator crbegin() const - { - return const_reverse_iterator(mend); - } - - //************************************************************************* - /// Returns a const reverse iterator to the end of the array. - //************************************************************************* - const_reverse_iterator rend() const - { - return const_reverse_iterator(mbegin); - } - - //************************************************************************* - /// Returns a const reverse iterator to the end of the array. - //************************************************************************* - const_reverse_iterator crend() const - { - return const_reverse_iterator(mbegin); - } - - //************************************************************************* - // Capacity - //************************************************************************* - - //************************************************************************* - /// Returns true if the array size is zero. - //************************************************************************* - bool empty() const - { - return (mbegin == mend); - } - - //************************************************************************* - /// Returns the size of the array. - //************************************************************************* - size_t size() const - { - return (mend - mbegin); - } - - //************************************************************************* - /// Returns the maximum possible size of the array. - //************************************************************************* - size_t max_size() const - { - return size(); - } - - //************************************************************************* - /// Assign from a view. - //************************************************************************* - const_array_view& operator=(const const_array_view& other) - { - mbegin = other.mbegin; - mend = other.mend; - return *this; - } - - //************************************************************************* - /// Assign from iterators - //************************************************************************* - template - void assign(TIterator begin_, TIterator end_) - { - mbegin = etl::addressof(*begin_); - mend = etl::addressof(*begin_) + std::distance(begin_, end_); - } - - //************************************************************************* - /// Assign from iterator and size. - //************************************************************************* - template - void assign(TIterator begin_, TSize size_) - { - mbegin = etl::addressof(*begin_); - mend = etl::addressof(*begin_) + size_; - } - - //************************************************************************* - /// Returns a const reference to the indexed value. - //************************************************************************* - const_reference operator[](size_t i) const - { - return mbegin[i]; - } - - //************************************************************************* - /// Returns a const reference to the indexed value. - //************************************************************************* - const_reference at(size_t i) const - { - ETL_ASSERT((mbegin != nullptr && mend != nullptr), ETL_ERROR(array_view_uninitialised)); - ETL_ASSERT(i < size(), ETL_ERROR(array_view_bounds)); - return mbegin[i]; - } - - //************************************************************************* - /// Swaps with another array_view. - //************************************************************************* - void swap(const_array_view& other) - { - std::swap(mbegin, other.mbegin); - std::swap(mend, other.mend); - } - - //************************************************************************* - /// Shrinks the view by moving its start forward. - //************************************************************************* - void remove_prefix(size_type n) - { - mbegin += n; - } - - //************************************************************************* - /// Shrinks the view by moving its end backward. - //************************************************************************* - void remove_suffix(size_type n) - { - mend -= n; - } - - //************************************************************************* - /// Equality for array views. - //************************************************************************* - friend bool operator == (const const_array_view& lhs, const const_array_view& rhs) - { - return (lhs.size() == rhs.size()) && - std::equal(lhs.begin(), lhs.end(), rhs.begin()); - } - - //************************************************************************* - /// Inequality for array views. - //************************************************************************* - friend bool operator != (const const_array_view& lhs, const const_array_view& rhs) - { - return !(lhs == rhs); - } - - //************************************************************************* - /// Less-than for array views. - //************************************************************************* - friend bool operator < (const const_array_view& lhs, const const_array_view& rhs) - { - return std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end()); - } - - //************************************************************************* - /// Greater-than for array views. - //************************************************************************* - friend bool operator > (const const_array_view& lhs, const const_array_view& rhs) - { - return rhs < lhs; - } - - //************************************************************************* - /// Less-than-equal for array views. - //************************************************************************* - friend bool operator <= (const const_array_view& lhs, const const_array_view& rhs) - { - return !(lhs > rhs); - } - - //************************************************************************* - /// Greater-than-equal for array views. - //************************************************************************* - friend bool operator >= (const const_array_view& lhs, const const_array_view& rhs) - { - return !(lhs < rhs); - } - - private: - - const T* mbegin; - const T* mend; - }; - //************************************************************************* /// Hash function. //************************************************************************* @@ -828,16 +499,6 @@ namespace etl reinterpret_cast(&view[view.size()])); } }; - - template - struct hash > - { - size_t operator()(const etl::const_array_view& view) const - { - return etl::private_hash::generic_hash(reinterpret_cast(&view[0]), - reinterpret_cast(&view[view.size()])); - } - }; #endif } @@ -850,15 +511,6 @@ void swap(etl::array_view& lhs, etl::array_view& rhs) lhs.swap(rhs); } -//************************************************************************* -/// Swaps the values. -//************************************************************************* -template -void swap(etl::const_array_view& lhs, etl::const_array_view& rhs) -{ - lhs.swap(rhs); -} - #undef ETL_FILE #endif diff --git a/include/etl/version.h b/include/etl/version.h index 9350ae81..dbc39bca 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 14 #define ETL_VERSION_MINOR 28 -#define ETL_VERSION_PATCH 2 +#define ETL_VERSION_PATCH 3 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH)) diff --git a/support/Release notes.txt b/support/Release notes.txt index 4302b29c..d013c4cb 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +14.28.3 +Removed redundant etl::const_array_view + =============================================================================== 14.28.2 Various fixes. diff --git a/test/test_array_view.cpp b/test/test_array_view.cpp index 1ada4ddc..125ba521 100644 --- a/test/test_array_view.cpp +++ b/test/test_array_view.cpp @@ -47,7 +47,7 @@ namespace typedef std::vector StlVData; typedef etl::array_view View; - typedef etl::const_array_view CView; + typedef etl::array_view CView; EtlData etldata = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; StlData stldata = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };