Skip to content

Commit 4809115

Browse files
author
Alexandre Hoffmann
committed
minor corrections suggested by Johan
1 parent f959b36 commit 4809115

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

include/xtensor/containers/xscalar.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ namespace xt
318318
using is_xscalar = detail::is_xscalar_impl<E>;
319319

320320
template <class E>
321-
concept is_xscalar_concept = is_xscalar<std::decay_t<E>>::value;
321+
concept xscalar_concept = is_xscalar<std::decay_t<E>>::value;
322322

323323
namespace detail
324324
{

include/xtensor/containers/xstorage.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace xt
5656
explicit uvector(size_type count, const allocator_type& alloc = allocator_type());
5757
uvector(size_type count, const_reference value, const allocator_type& alloc = allocator_type());
5858

59-
template <input_iterator_concept InputIt>
59+
template <std::input_iterator InputIt>
6060
uvector(InputIt first, InputIt last, const allocator_type& alloc = allocator_type());
6161

6262
uvector(std::initializer_list<T> init, const allocator_type& alloc = allocator_type());
@@ -269,7 +269,7 @@ namespace xt
269269
}
270270

271271
template <class T, class A>
272-
template <input_iterator_concept InputIt>
272+
template <std::input_iterator InputIt>
273273
inline uvector<T, A>::uvector(InputIt first, InputIt last, const allocator_type& alloc)
274274
: m_allocator(alloc)
275275
, p_begin(nullptr)
@@ -667,7 +667,7 @@ namespace xt
667667

668668
svector(const std::vector<T>& vec);
669669

670-
template <input_iterator_concept IT>
670+
template <std::input_iterator IT>
671671
svector(IT begin, IT end, const allocator_type& alloc = allocator_type());
672672

673673
template <std::size_t N2, bool I2>
@@ -803,7 +803,7 @@ namespace xt
803803
}
804804

805805
template <class T, std::size_t N, class A, bool Init>
806-
template <input_iterator_concept IT>
806+
template <std::input_iterator IT>
807807
inline svector<T, N, A, Init>::svector(IT begin, IT end, const allocator_type& alloc)
808808
: m_allocator(alloc)
809809
{

include/xtensor/utils/xutils.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -632,9 +632,6 @@ namespace xt
632632

633633
template <typename E>
634634
concept iterator_concept = is_iterator<E>::value;
635-
template <typename E>
636-
concept input_iterator_concept = std::
637-
is_convertible<typename std::iterator_traits<E>::iterator_category, std::input_iterator_tag>::value;
638635

639636
/********************************************
640637
* xtrivial_default_construct implemenation *

include/xtensor/views/xview.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,13 +596,13 @@ namespace xt
596596
inline const_container_iterator data_xend(layout_type l, size_type offset) const noexcept;
597597

598598
// Conversion operator enabled for statically "scalar" views
599-
template <is_xscalar_concept ST = self_type>
599+
template <xscalar_concept ST = self_type>
600600
operator reference()
601601
{
602602
return (*this)();
603603
}
604604

605-
template <is_xscalar_concept ST = self_type>
605+
template <xscalar_concept ST = self_type>
606606
operator const_reference() const
607607
{
608608
return (*this)();

0 commit comments

Comments
 (0)