rename ptr_index, ptr_unindex

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

View file

@ -30,9 +30,9 @@ namespace sprout {
inline SPROUT_CONSTEXPR void const*
memchr(void const* s, int c, std::size_t n) {
return sprout::detail::memchr_impl(
sprout::as_iterator_base(
sprout::ptr_unindex(
sprout::find(
sprout::as_iterator(static_cast<unsigned char const*>(s)), sprout::as_iterator(static_cast<unsigned char const*>(s), n),
sprout::ptr_index(static_cast<unsigned char const*>(s)), sprout::ptr_index(static_cast<unsigned char const*>(s), n),
static_cast<unsigned char>(c)
)
),
@ -43,9 +43,9 @@ namespace sprout {
inline SPROUT_CONSTEXPR void*
memchr(void* s, int c, std::size_t n) {
return sprout::detail::memchr_impl(
sprout::as_iterator_base(
sprout::ptr_unindex(
sprout::find(
sprout::as_iterator(static_cast<unsigned char*>(s)), sprout::as_iterator(static_cast<unsigned char*>(s), n),
sprout::ptr_index(static_cast<unsigned char*>(s)), sprout::ptr_index(static_cast<unsigned char*>(s), n),
static_cast<unsigned char>(c)
)
),

View file

@ -15,8 +15,8 @@ namespace sprout {
inline SPROUT_CONSTEXPR int
memcmp(void const* s1, void const* s2, std::size_t n) {
return sprout::tristate_lexicographical_compare(
sprout::as_iterator(static_cast<unsigned char const*>(s1)), sprout::as_iterator(static_cast<unsigned char const*>(s1), n),
sprout::as_iterator(static_cast<unsigned char const*>(s2)), sprout::as_iterator(static_cast<unsigned char const*>(s2), n)
sprout::ptr_index(static_cast<unsigned char const*>(s1)), sprout::ptr_index(static_cast<unsigned char const*>(s1), n),
sprout::ptr_index(static_cast<unsigned char const*>(s2)), sprout::ptr_index(static_cast<unsigned char const*>(s2), n)
);
}
} // namespace sprout

View file

@ -70,8 +70,8 @@ namespace sprout {
inline SPROUT_CONSTEXPR std::size_t
strlen(char const* s, std::size_t n) {
return sprout::distance(
sprout::as_iterator(s),
sprout::find(sprout::as_iterator(s), sprout::as_iterator(s, n), '\0')
sprout::ptr_index(s),
sprout::find(sprout::ptr_index(s), sprout::ptr_index(s, n), '\0')
);
}
@ -91,8 +91,8 @@ namespace sprout {
strlen(Elem* s, std::size_t n) {
typedef typename std::decay<Elem>::type type;
return sprout::distance(
sprout::as_iterator(s),
sprout::find(sprout::as_iterator(s), sprout::as_iterator(s, n), type())
sprout::ptr_index(s),
sprout::find(sprout::ptr_index(s), sprout::ptr_index(s, n), type())
);
}
} // namespace sprout

View file

@ -17,8 +17,8 @@ namespace sprout {
inline SPROUT_CONSTEXPR int
strncmp(char const* s1, char const* s2, std::size_t n) {
return sprout::tristate_lexicographical_compare(
sprout::as_iterator(s1), sprout::as_iterator(s1, n), '\0',
sprout::as_iterator(s2), sprout::as_iterator(s2, n), '\0'
sprout::ptr_index(s1), sprout::ptr_index(s1, n), '\0',
sprout::ptr_index(s2), sprout::ptr_index(s2, n), '\0'
);
}
@ -30,8 +30,8 @@ namespace sprout {
strncmp(Elem* s1, Elem* s2, std::size_t n) {
typedef typename std::decay<Elem>::type type;
return sprout::tristate_lexicographical_compare(
sprout::as_iterator(s1), sprout::as_iterator(s1, n), type(),
sprout::as_iterator(s2), sprout::as_iterator(s2, n), type()
sprout::ptr_index(s1), sprout::ptr_index(s1, n), type(),
sprout::ptr_index(s2), sprout::ptr_index(s2, n), type()
);
}
} // namespace sprout