mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-02 14:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename ptr_index, ptr_unindex

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-02-26 17:03:30 +09:00
parent 899bf3fa77
commit a5e14e71e1
10 changed files with 75 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sprout/string/char_traits.hpp
View file

@ -74,8 +74,8 @@ namespace sprout {
}
static SPROUT_CONSTEXPR int compare(char_type const* s1, char_type const* s2, std::size_t n) {
return sprout::tristate_lexicographical_compare(
sprout::as_iterator(s1), sprout::as_iterator(s1, n), char_type(),
sprout::as_iterator(s2), sprout::as_iterator(s2, n), char_type(),
sprout::ptr_index(s1), sprout::ptr_index(s1, n), char_type(),
sprout::ptr_index(s2), sprout::ptr_index(s2, n), char_type(),
sprout::detail::char_traits_lt<char_traits>()
);
}
@ -84,9 +84,9 @@ namespace sprout {
}
static SPROUT_CONSTEXPR char_type const* find(char_type const* s, std::size_t n, char_type const& a) {
return find_impl(
sprout::as_iterator_base(
sprout::ptr_unindex(
sprout::find_if(
sprout::as_iterator(s), sprout::as_iterator(s, n),
sprout::ptr_index(s), sprout::ptr_index(s, n),
sprout::bind2nd(sprout::detail::char_traits_eq<char_traits>(), a)
)
),
@ -121,7 +121,7 @@ namespace sprout {
template<typename ConstIterator>
static SPROUT_CONSTEXPR int compare(char_type const* s1, ConstIterator s2, std::size_t n) {
return sprout::tristate_lexicographical_compare(
sprout::as_iterator(s1), sprout::as_iterator(s1, n), char_type(),
sprout::ptr_index(s1), sprout::ptr_index(s1, n), char_type(),
s2, s2 + n, char_type(),
sprout::detail::char_traits_lt<char_traits>()
);
@ -130,7 +130,7 @@ namespace sprout {
static SPROUT_CONSTEXPR int compare(ConstIterator s1, char_type const* s2, std::size_t n) {
return sprout::tristate_lexicographical_compare(
s1, s1 + n, char_type(),
sprout::as_iterator(s2), sprout::as_iterator(s2, n), char_type(),
sprout::ptr_index(s2), sprout::ptr_index(s2, n), char_type(),
sprout::detail::char_traits_lt<char_traits>()
);
}
@ -148,7 +148,7 @@ namespace sprout {
}
template<typename ConstIterator>
static SPROUT_CONSTEXPR ConstIterator find(ConstIterator s, std::size_t n, char_type const& a) {
return sprout::as_iterator_base(
return sprout::ptr_unindex(
sprout::find_if(
s, s + n,
sprout::bind2nd(sprout::detail::char_traits_eq<char_traits>(), a)
@ -190,9 +190,9 @@ namespace sprout {
return sprout::strlen(s, n);
}
static SPROUT_CONSTEXPR char_type const* find(char_type const* s, std::size_t n, char_type const& a) {
return sprout::as_iterator_base(
return sprout::ptr_unindex(
sprout::find_if(
sprout::as_iterator(s), sprout::as_iterator(s, n),
sprout::ptr_index(s), sprout::ptr_index(s, n),
sprout::bind2nd(sprout::detail::char_traits_eq<traits_type>(), a)
)
);