From 47c47c5d328a2765bb6552fe295e35061e5aebbe Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 27 Jun 2018 19:43:20 +0100 Subject: [PATCH] Removed non-C++03 compliant function template default types. --- include/etl/array_view.h | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/include/etl/array_view.h b/include/etl/array_view.h index 7a9722c7..b56e21e5 100644 --- a/include/etl/array_view.h +++ b/include/etl/array_view.h @@ -123,8 +123,7 @@ namespace etl /// Construct from std::array or etl::array or other type that supports /// data() and size() member functions. //************************************************************************* - template ::value, void>::type> + template explicit array_view(TArray& a) : mbegin(a.data()), mend(a.data() + a.size()) @@ -134,8 +133,7 @@ namespace etl //************************************************************************* /// Construct from iterators //************************************************************************* - template ::value, void>::type> + template array_view(TIterator begin_, TIterator end_) : mbegin(etl::addressof(*begin_)), mend(etl::addressof(*begin_) + std::distance(begin_, end_)) @@ -146,8 +144,7 @@ namespace etl /// Construct from C array //************************************************************************* template ::value, void>::type> + typename TSize> array_view(TIterator begin_, TSize size_) : mbegin(etl::addressof(*begin_)), mend(etl::addressof(*begin_) + size_) @@ -354,24 +351,22 @@ namespace etl //************************************************************************* /// Assign from iterators //************************************************************************* - template ::value, void>::type> + template void assign(TIterator begin_, TIterator end_) { mbegin = etl::addressof(*begin_); - mend = etl::addressof(*begin_) + std::distance(begin_, end_); + mend = etl::addressof(*begin_) + std::distance(begin_, end_); } //************************************************************************* /// Assign from iterator and size. //************************************************************************* template ::value, void>::type> + typename TSize> void assign(TIterator begin_, TSize size_) { mbegin = etl::addressof(*begin_); - mend = etl::addressof(*begin_) + size_; + mend = etl::addressof(*begin_) + size_; } //************************************************************************* @@ -518,8 +513,7 @@ namespace etl /// Construct from std::array or etl::array or other type that supports /// data() and size() member functions. //************************************************************************* - template ::value, void>::type> + template explicit const_array_view(TArray& a) : mbegin(a.data()), mend(a.data() + a.size()) @@ -529,8 +523,7 @@ namespace etl //************************************************************************* /// Construct from iterators //************************************************************************* - template ::value, void>::type> + template const_array_view(TIterator begin_, TIterator end_) : mbegin(etl::addressof(*begin_)), mend(etl::addressof(*begin_) + std::distance(begin_, end_)) @@ -541,7 +534,7 @@ namespace etl /// Construct from C array //************************************************************************* template ::value, void>::type> + typename TSize> const_array_view(TIterator begin_, TSize size_) : mbegin(etl::addressof(*begin_)), mend(etl::addressof(*begin_) + size_) @@ -705,8 +698,7 @@ namespace etl //************************************************************************* /// Assign from iterators //************************************************************************* - template ::value, void>::type> + template void assign(TIterator begin_, TIterator end_) { mbegin = etl::addressof(*begin_); @@ -717,8 +709,7 @@ namespace etl /// Assign from iterator and size. //************************************************************************* template ::value, void>::type> + typename TSize> void assign(TIterator begin_, TSize size_) { mbegin = etl::addressof(*begin_); @@ -833,7 +824,7 @@ namespace etl size_t operator()(const etl::array_view& view) const { return etl::private_hash::generic_hash(reinterpret_cast(&view[0]), - reinterpret_cast(&view[view.size()])); + reinterpret_cast(&view[view.size()])); } }; @@ -843,7 +834,7 @@ namespace etl 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()])); + reinterpret_cast(&view[view.size()])); } }; #endif