coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflit commit errors

Browse Source
This commit is contained in:
John Wellbelove 2026-03-13 09:26:04 +00:00 committed by GitHub
parent c60b43085b
commit 3cef79300e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/etl/iterator.h
View File

@ -1920,6 +1920,27 @@ namespace etl
{
return first.count();
}
#endif
#if ETL_USING_CPP14
template <class T, typename = void>
struct is_range: etl::false_type
{
};
template <class T>
struct is_range<T,
etl::void_t<decltype(ETL_OR_STD::begin(etl::declval<T&>())),
decltype(ETL_OR_STD::end(etl::declval<T&>()))>>: etl::true_type
{
};
#if ETL_USING_CPP17
template <typename T>
inline constexpr bool is_range_v = is_range<T>::value;
#endif
#endif
#if ETL_NOT_USING_STL || ETL_CPP17_NOT_SUPPORTED
//**************************************************************************
/// Returns a pointer to the block of memory containing the elements of the range.
@ -1964,25 +1985,3 @@ namespace etl
}
#endif
#if ETL_USING_CPP14
template <class T, typename = void>
struct is_range: etl::false_type
{
};
template <class T>
struct is_range<T,
etl::void_t<decltype(ETL_OR_STD::begin(etl::declval<T&>())),
decltype(ETL_OR_STD::end(etl::declval<T&>()))>>: etl::true_type
{
};
#if ETL_USING_CPP17
template <typename T>
inline constexpr bool is_range_v = is_range<T>::value;
#endif
#endif
}
#endif