mirror of
https://github.com/bolero-MURAKAMI/Sprout
synced 2025-08-03 12:49:50 +00:00
fix adapt interface: container, tuple, hash, generator
This commit is contained in:
parent
61720b72c3
commit
74e0c8acd6
36 changed files with 975 additions and 1061 deletions
|
@ -4,6 +4,7 @@
|
|||
#include <cstddef>
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/container/container_traits.hpp>
|
||||
#include <sprout/container/container_range_traits.hpp>
|
||||
#include <sprout/adl/not_found.hpp>
|
||||
|
||||
namespace sprout_adl {
|
||||
|
@ -13,56 +14,41 @@ namespace sprout_adl {
|
|||
namespace sprout {
|
||||
namespace container_detail {
|
||||
template<typename Container>
|
||||
inline typename sprout::container_traits<Container>::iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container>::iterator
|
||||
range_end(Container& cont) {
|
||||
return cont.end();
|
||||
return sprout::container_range_traits<Container>::range_end(cont);
|
||||
}
|
||||
template<typename Container>
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container>::const_iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container const>::iterator
|
||||
range_end(Container const& cont) {
|
||||
return cont.end();
|
||||
}
|
||||
|
||||
template<typename T, std::size_t N>
|
||||
inline typename sprout::container_traits<T[N]>::iterator
|
||||
range_end(T (& arr)[N]) {
|
||||
typedef typename sprout::container_traits<T[N]>::iterator iterator;
|
||||
return iterator(arr) + N;
|
||||
}
|
||||
template<typename T, std::size_t N>
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<T const[N]>::const_iterator
|
||||
range_end(T const (& arr)[N]) {
|
||||
typedef typename sprout::container_traits<T const[N]>::const_iterator iterator;
|
||||
return iterator(arr) + N;
|
||||
return sprout::container_range_traits<Container>::range_end(cont);
|
||||
}
|
||||
} // namespace container_detail
|
||||
} // namespace sprout
|
||||
|
||||
namespace sprout {
|
||||
//
|
||||
// end
|
||||
//
|
||||
template<typename Container>
|
||||
inline typename sprout::container_traits<Container>::iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container>::iterator
|
||||
end(Container& cont) {
|
||||
using sprout::container_detail::range_end;
|
||||
using sprout_adl::range_end;
|
||||
return range_end(cont);
|
||||
}
|
||||
template<typename Container>
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container>::const_iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container const>::iterator
|
||||
end(Container const& cont) {
|
||||
using sprout::container_detail::range_end;
|
||||
using sprout_adl::range_end;
|
||||
return range_end(cont);
|
||||
}
|
||||
template<typename T, std::size_t N>
|
||||
inline typename sprout::container_traits<T[N]>::iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<T[N]>::iterator
|
||||
end(T (& arr)[N]) {
|
||||
return sprout::container_detail::range_end(arr);
|
||||
}
|
||||
template<typename T, std::size_t N>
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<T const[N]>::const_iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<T const[N]>::iterator
|
||||
end(T const (& arr)[N]) {
|
||||
return sprout::container_detail::range_end(arr);
|
||||
}
|
||||
|
@ -71,14 +57,14 @@ namespace sprout {
|
|||
// cend
|
||||
//
|
||||
template<typename Container>
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container>::const_iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<Container const>::iterator
|
||||
cend(Container const& cont) {
|
||||
using sprout::container_detail::range_end;
|
||||
using sprout_adl::range_end;
|
||||
return range_end(cont);
|
||||
}
|
||||
template<typename T, std::size_t N>
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<T const[N]>::const_iterator
|
||||
inline SPROUT_CONSTEXPR typename sprout::container_traits<T const[N]>::iterator
|
||||
cend(T const (& arr)[N]) {
|
||||
return sprout::container_detail::range_end(arr);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue