diff --git a/alib2std/src/extensions/iterator.hpp b/alib2std/src/extensions/iterator.hpp index 0538fedd37ce95dc0d74771957fc5d124f54e97b..b0b3f316822f7a01c7154446a7e79f34134a990e 100644 --- a/alib2std/src/extensions/iterator.hpp +++ b/alib2std/src/extensions/iterator.hpp @@ -1002,30 +1002,6 @@ auto end ( Container && cont ) -> decltype ( std::forward ( cont ).end ( ) ) { return std::forward ( cont ).end ( ); } -/** - * Specialization of begin for static array. - * - * \param arr the static array - * - * \result the begining of the array - */ -template < class T, size_t N > -constexpr T * begin ( T ( & arr ) [ N ] ) noexcept { - return arr; -} - -/** - * Specialization of end for static array. - * - * \param arr the static array - * - * \result the one after the last element in the array - */ -template < class T, size_t N > -constexpr T * end ( T ( & arr ) [ N ] ) noexcept { - return arr + N; -} - /** * \brief * Output iterator calling a callback function on assignment diff --git a/alib2std/src/extensions/range.hpp b/alib2std/src/extensions/range.hpp index 2d1d2a4f237be40a41a1bd810769f26c31e1b9ed..6b0170080a975eca6451182ce66c07de3722527d 100644 --- a/alib2std/src/extensions/range.hpp +++ b/alib2std/src/extensions/range.hpp @@ -259,18 +259,6 @@ auto range ( Container && cont ) -> decltype ( std::forward < Container > ( cont return ext::make_iterator_range ( std::forward < Container > ( cont ).begin ( ), std::forward < Container > ( cont ).end ( ) ); } -/** - * Specialization of range for static array. - * - * \param arr the static array - * - * \result the range over all elements of the array - */ -template < class T, size_t N > -constexpr ext::iterator_range < T * > range ( T ( & arr ) [ N ] ) noexcept { - return ext::make_iterator_range ( begin ( arr ), end ( arr ) ); -} - } /* namespace ext */ #endif /* __RANGE_HPP_ */ diff --git a/alib2std/test-src/extensions/RangeTest.cpp b/alib2std/test-src/extensions/RangeTest.cpp index 9ec4bca19ae0929778757051ac900e20fc8933e7..a34f3f36843593cffe0b6680ae25a841d3e2b545 100644 --- a/alib2std/test-src/extensions/RangeTest.cpp +++ b/alib2std/test-src/extensions/RangeTest.cpp @@ -5,27 +5,17 @@ #include <alib/list> TEST_CASE ( "Range", "[unit][std][bits]" ) { - int arr[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - SECTION ( "Constructor" ) { - ext::iterator_range < int * > ra1 = ext::range ( arr ); - ext::vector < int > v1 = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; ext::iterator_range < ext::vector < int >::iterator > rv1 ( v1.begin ( ), v1.end ( ) ); - CHECK ( ( std::equal ( ra1.begin ( ), ra1.end ( ), rv1.begin ( ), rv1.end ( ) ) ) ); - auto rv2 = ext::range ( v1 ); CHECK ( ( std::equal ( rv1.begin ( ), rv1.end ( ), rv2.begin ( ), rv2.end ( ) ) ) ); } SECTION ( "Size" ) { - ext::iterator_range < int * > ra1 ( arr, arr + sizeof ( arr ) / sizeof ( * arr ) ); - - CHECK ( ra1.size ( ) == 10 ); - ext::vector < int > v1 = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; ext::iterator_range < ext::vector < int >::iterator > rv1 ( v1.begin ( ), v1.end ( ) );