mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-10-19 13:49:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix implementation

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-01-12 04:08:44 +09:00
commit f26032dce8
33 changed files with 81 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sprout/string/char_traits.hpp
View file

@ -7,8 +7,8 @@
#include <sprout/config.hpp>
#include <sprout/functional/bind2nd.hpp>
#include <sprout/iterator/ptr_index_iterator.hpp>
#include <sprout/algorithm/find_if.hpp>
#include <sprout/algorithm/tristate_lexicographical_compare.hpp>
#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
#include <sprout/iterator/operation.hpp>
namespace sprout {
@ -69,7 +69,7 @@ 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(
NS_SSCRISK_CEL_OR_SPROUT::find_if(
sprout::find_if(
sprout::as_iterator(s), sprout::as_iterator(s, n),
sprout::bind2nd(eq_(), a)
)
@ -135,7 +135,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(
NS_SSCRISK_CEL_OR_SPROUT::find_if(
sprout::find_if(
s, s + n,
sprout::bind2nd(eq_(), a)
)
@ -187,7 +187,7 @@ namespace sprout {
}
static SPROUT_CONSTEXPR char_type const* find(char_type const* s, std::size_t n, char_type const& a) {
return sprout::as_iterator_base(
NS_SSCRISK_CEL_OR_SPROUT::find_if(
sprout::find_if(
sprout::as_iterator(s), sprout::as_iterator(s, n),
sprout::bind2nd(eq_(), a)
)
@ -206,7 +206,7 @@ namespace sprout {
}
template<typename ConstIterator>
static SPROUT_CONSTEXPR ConstIterator find(ConstIterator s, std::size_t n, char_type const& a) {
return NS_SSCRISK_CEL_OR_SPROUT::find_if(
return sprout::find_if(
s, s + n,
sprout::bind2nd(eq_(), a)
);

5
sprout/string/string.hpp
View file

@ -10,12 +10,13 @@
#include <sprout/index_tuple.hpp>
#include <sprout/array.hpp>
#include <sprout/iterator/reverse_iterator.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/algorithm/find.hpp>
#include <sprout/utility/forward.hpp>
#include <sprout/utility/swap.hpp>
#include <sprout/string/char_traits.hpp>
#include <sprout/string/npos.hpp>
#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
#include <sprout/iterator/operation.hpp>
#if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION
# include <sprout/iterator/index_iterator.hpp>
#endif
@ -823,7 +824,7 @@ namespace sprout {
length_impl(sprout::array<T, M> const& arr) {
return sprout::distance(
arr.begin(),
NS_SSCRISK_CEL_OR_SPROUT::find(arr.begin(), arr.end(), T())
sprout::find(arr.begin(), arr.end(), T())
);
}
template<typename... Args, sprout::index_t... Indexes>