fix implementation

sprout/algorithm/fit/clamp_range_copy.hpp

@@ -7,8 +7,8 @@
 #include <sprout/algorithm/fixed/clamp_range_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fixed/bogo_sort.hpp

@@ -7,9 +7,9 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
+#include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/shuffle_result.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
@@ -18,7 +18,7 @@ namespace sprout {
 			template<typename Container, typename Shuffled, typename Compare>
 			inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
 			bogo_sort_impl_1(Shuffled const& shuffled, Compare comp) {
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(sprout::tuples::get<0>(shuffled)),
 					sprout::end(sprout::tuples::get<0>(shuffled)),
 					comp
@@ -36,7 +36,7 @@ namespace sprout {
 			template<typename Container, typename UniformRandomNumberGenerator, typename Compare>
 			inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
 			bogo_sort_impl(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) {
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(cont),
 					sprout::end(cont),
 					comp

sprout/algorithm/fixed/bogo_sort_result.hpp

@@ -8,9 +8,9 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
+#include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/shuffle_result.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
@@ -22,7 +22,7 @@ namespace sprout {
 				typename std::decay<UniformRandomNumberGenerator>::type
 			>
 			bogo_sort_result_impl_1(Shuffled const& shuffled, Compare comp) {
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(sprout::tuples::get<0>(shuffled)),
 					sprout::end(sprout::tuples::get<0>(shuffled)),
 					comp
@@ -47,7 +47,7 @@ namespace sprout {
 					typename sprout::fixed::result_of::algorithm<Container>::type,
 					typename std::decay<UniformRandomNumberGenerator>::type
 				> result_type;
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(cont),
 					sprout::end(cont),
 					comp

sprout/algorithm/fixed/bozo_sort.hpp

@@ -7,9 +7,9 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
+#include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/random_swap_result.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
@@ -18,7 +18,7 @@ namespace sprout {
 			template<typename Container, typename Shuffled, typename Compare>
 			inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
 			bozo_sort_impl_1(Shuffled const& shuffled, Compare comp) {
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(sprout::tuples::get<0>(shuffled)),
 					sprout::end(sprout::tuples::get<0>(shuffled)),
 					comp
@@ -36,7 +36,7 @@ namespace sprout {
 			template<typename Container, typename UniformRandomNumberGenerator, typename Compare>
 			inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
 			bozo_sort_impl(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) {
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(cont),
 					sprout::end(cont),
 					comp

sprout/algorithm/fixed/bozo_sort_result.hpp

@@ -8,9 +8,9 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
+#include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/random_swap_result.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
@@ -22,7 +22,7 @@ namespace sprout {
 				typename std::decay<UniformRandomNumberGenerator>::type
 			>
 			bozo_sort_result_impl_1(Shuffled const& shuffled, Compare comp) {
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(sprout::tuples::get<0>(shuffled)),
 					sprout::end(sprout::tuples::get<0>(shuffled)),
 					comp
@@ -47,7 +47,7 @@ namespace sprout {
 					typename sprout::fixed::result_of::algorithm<Container>::type,
 					typename std::decay<UniformRandomNumberGenerator>::type
 				> result_type;
-				return NS_SSCRISK_CEL_OR_SPROUT::is_sorted(
+				return sprout::is_sorted(
 					sprout::begin(cont),
 					sprout::end(cont),
 					comp

sprout/algorithm/fixed/copy_until.hpp

@@ -7,10 +7,10 @@
 #include <sprout/container/traits.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find_if.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/copy.hpp>
 #include <sprout/detail/container_complate.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fixed {
@@ -22,7 +22,7 @@ namespace sprout {
 				std::random_access_iterator_tag*
 				)
 			{
-				return sprout::fixed::copy(first, NS_SSCRISK_CEL_OR_SPROUT::find_if(first, last, pred), result);
+				return sprout::fixed::copy(first, sprout::find_if(first, last, pred), result);
 			}
 			template<typename InputIterator, typename Result, typename Predicate, typename... Args>
 			inline SPROUT_CONSTEXPR typename std::enable_if<

sprout/algorithm/fixed/copy_while.hpp

@@ -7,10 +7,10 @@
 #include <sprout/container/traits.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find_if_not.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/copy.hpp>
 #include <sprout/detail/container_complate.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fixed {
@@ -22,7 +22,7 @@ namespace sprout {
 				std::random_access_iterator_tag*
 				)
 			{
-				return sprout::fixed::copy(first, NS_SSCRISK_CEL_OR_SPROUT::find_if_not(first, last, pred), result);
+				return sprout::fixed::copy(first, sprout::find_if_not(first, last, pred), result);
 			}
 			template<typename InputIterator, typename Result, typename Predicate, typename... Args>
 			inline SPROUT_CONSTEXPR typename std::enable_if<

sprout/array/array.hpp

@@ -11,7 +11,6 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/reverse_iterator.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION
 #	include <sprout/iterator/index_iterator.hpp>
 #endif

sprout/array/comparison.hpp

@@ -4,7 +4,8 @@
 #include <cstddef>
 #include <sprout/config.hpp>
 #include <sprout/array/array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
+#include <sprout/algorithm/equal.hpp>
+#include <sprout/algorithm/lexicographical_compare.hpp>
 
 namespace sprout {
 	//
@@ -18,7 +19,7 @@ namespace sprout {
 	template<typename T, std::size_t N>
 	inline SPROUT_CONSTEXPR bool
 	operator==(sprout::array<T, N> const& lhs, sprout::array<T, N> const& rhs) {
-		return NS_SSCRISK_CEL_OR_SPROUT::equal(lhs.begin(), lhs.end(), rhs.begin());
+		return sprout::equal(lhs.begin(), lhs.end(), rhs.begin());
 	}
 	template<typename T, std::size_t N>
 	inline SPROUT_CONSTEXPR bool
@@ -28,7 +29,7 @@ namespace sprout {
 	template<typename T, std::size_t N>
 	inline SPROUT_CONSTEXPR bool
 	operator<(sprout::array<T, N> const& lhs, sprout::array<T, N> const& rhs) {
-		return NS_SSCRISK_CEL_OR_SPROUT::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+		return sprout::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
 	}
 	template<typename T, std::size_t N>
 	inline SPROUT_CONSTEXPR bool

sprout/bitset/bitset.hpp

@@ -11,14 +11,17 @@
 #include <sprout/container/traits.hpp>
 #include <sprout/iterator/index_iterator.hpp>
 #include <sprout/functional/hash/hash.hpp>
+#include <sprout/algorithm/all_of.hpp>
+#include <sprout/algorithm/any_of.hpp>
+#include <sprout/algorithm/find_if.hpp>
+#include <sprout/algorithm/equal.hpp>
 #include <sprout/algorithm/fixed/transform.hpp>
 #include <sprout/algorithm/fixed/fill.hpp>
+#include <sprout/numeric/accumulate.hpp>
 #include <sprout/operation/fixed/set.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/bit/operation.hpp>
 #include <sprout/math/comparison.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
-#include HDR_NUMERIC_SSCRISK_CEL_OR_SPROUT
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
@@ -381,34 +384,34 @@ namespace sprout {
 
 			SPROUT_CONSTEXPR bool
 			is_equal(base_bitset<N> const& x) const SPROUT_NOEXCEPT {
-				return NS_SSCRISK_CEL_OR_SPROUT::equal(begin(), end(), x.begin());
+				return sprout::equal(begin(), end(), x.begin());
 			}
 			template<std::size_t N2>
 			SPROUT_CONSTEXPR bool
 			are_all() const SPROUT_NOEXCEPT {
-				return NS_SSCRISK_CEL_OR_SPROUT::all_of(begin(), end() - 1, are_all_pred())
+				return sprout::all_of(begin(), end() - 1, are_all_pred())
 					&& hiword() == (~static_cast<word_type>(0) >> (N * (CHAR_BIT * sizeof(unsigned long)) - N2))
 					;
 			}
 			SPROUT_CONSTEXPR bool
 			is_any() const SPROUT_NOEXCEPT {
-				return NS_SSCRISK_CEL_OR_SPROUT::any_of(begin(), end(), is_any_pred());
+				return sprout::any_of(begin(), end(), is_any_pred());
 			}
 			SPROUT_CONSTEXPR std::size_t
 			do_count() const SPROUT_NOEXCEPT {
-				return NS_SSCRISK_CEL_OR_SPROUT::accumulate(begin(), end(), static_cast<std::size_t>(0), count_op());
+				return sprout::accumulate(begin(), end(), static_cast<std::size_t>(0), count_op());
 			}
 
 			SPROUT_CONSTEXPR unsigned long
 			do_to_ulong() const {
-				return NS_SSCRISK_CEL_OR_SPROUT::find_if(begin() + 1, end(), to_ulong_pred()) != end()
+				return sprout::find_if(begin() + 1, end(), to_ulong_pred()) != end()
 					? throw std::overflow_error("base_bitset::do_to_ulong")
 					: w_[0]
 					;
 			}
 			SPROUT_CONSTEXPR unsigned long long
 			do_to_ullong() const {
-				return NS_SSCRISK_CEL_OR_SPROUT::find_if(
+				return sprout::find_if(
 					sizeof(unsigned long long) > sizeof(unsigned long) ? begin() + 2
 						: begin() + 1
 						,

sprout/cstring/memchr.hpp

@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <sprout/config.hpp>
 #include <sprout/iterator/ptr_index_iterator.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace detail {
@@ -27,7 +27,7 @@ namespace sprout {
 	memchr(void const* s, int c, std::size_t n) {
 		return sprout::detail::memchr_impl(
 			sprout::as_iterator_base(
-				NS_SSCRISK_CEL_OR_SPROUT::find(
+				sprout::find(
 					sprout::as_iterator(static_cast<unsigned char const*>(s)), sprout::as_iterator(static_cast<unsigned char const*>(s), n),
 					static_cast<unsigned char>(c)
 					)
@@ -40,7 +40,7 @@ namespace sprout {
 	memchr(void* s, int c, std::size_t n) {
 		return sprout::detail::memchr_impl(
 			sprout::as_iterator_base(
-				NS_SSCRISK_CEL_OR_SPROUT::find(
+				sprout::find(
 					sprout::as_iterator(static_cast<unsigned char*>(s)), sprout::as_iterator(static_cast<unsigned char*>(s), n),
 					static_cast<unsigned char>(c)
 					)

sprout/cstring/strlen.hpp

@@ -4,8 +4,8 @@
 #include <cstddef>
 #include <sprout/config.hpp>
 #include <sprout/iterator/ptr_index_iterator.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	// 7.21.6.3  strlen ŠÖ<C5A0>”
@@ -20,7 +20,7 @@ namespace sprout {
 	strlen(char const* s, std::size_t n) {
 		return sprout::distance(
 			sprout::as_iterator(s),
-			NS_SSCRISK_CEL_OR_SPROUT::find(sprout::as_iterator(s), sprout::as_iterator(s, n), '\0')
+			sprout::find(sprout::as_iterator(s), sprout::as_iterator(s, n), '\0')
 			);
 	}
 }	// namespace sprout

sprout/cstring/strncmp.hpp

@@ -5,7 +5,6 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/ptr_index_iterator.hpp>
 #include <sprout/algorithm/tristate_lexicographical_compare.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	// 7.21.4.4  strncmp ŠÖ<C5A0>”

sprout/cwchar/wcslen.hpp

@@ -4,8 +4,8 @@
 #include <cstddef>
 #include <sprout/config.hpp>
 #include <sprout/iterator/ptr_index_iterator.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	//
@@ -22,7 +22,7 @@ namespace sprout {
 	wcslen(wchar_t const* s, std::size_t n) {
 		return sprout::distance(
 			sprout::as_iterator(s),
-			NS_SSCRISK_CEL_OR_SPROUT::find(sprout::as_iterator(s), sprout::as_iterator(s, n), L'\0')
+			sprout::find(sprout::as_iterator(s), sprout::as_iterator(s, n), L'\0')
 			);
 	}
 }	// namespace sprout

sprout/cwchar/wcsncmp.hpp

@@ -5,7 +5,6 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/ptr_index_iterator.hpp>
 #include <sprout/algorithm/tristate_lexicographical_compare.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	//

sprout/cwchar/wmemchr.hpp

@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <sprout/config.hpp>
 #include <sprout/iterator/ptr_index_iterator.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace detail {
@@ -29,7 +29,7 @@ namespace sprout {
 	wmemchr(wchar_t const* s, wchar_t c, size_t n) {
 		return sprout::detail::wmemchr_impl(
 			sprout::as_iterator_base(
-				NS_SSCRISK_CEL_OR_SPROUT::find(
+				sprout::find(
 					sprout::as_iterator(s), sprout::as_iterator(s, n),
 					c
 					)
@@ -42,7 +42,7 @@ namespace sprout {
 	wmemchr(wchar_t* s, wchar_t c, size_t n) {
 		return sprout::detail::wmemchr_impl(
 			sprout::as_iterator_base(
-				NS_SSCRISK_CEL_OR_SPROUT::find(
+				sprout::find(
 					sprout::as_iterator(s), sprout::as_iterator(s, n),
 					c
 					)

sprout/numeric/dft/fit/amplitude_spectrum.hpp

@@ -7,8 +7,8 @@
 #include <sprout/numeric/dft/fixed/amplitude_spectrum.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fit {

sprout/numeric/dft/fit/dft.hpp

@@ -7,8 +7,8 @@
 #include <sprout/numeric/dft/fixed/dft.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fit {

sprout/numeric/dft/fit/idft.hpp

@@ -7,8 +7,8 @@
 #include <sprout/numeric/dft/fixed/idft.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fit {

sprout/numeric/dft/fit/phase_spectrum.hpp

@@ -7,8 +7,8 @@
 #include <sprout/numeric/dft/fixed/phase_spectrum.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fit {

sprout/numeric/fit/adjacent_difference.hpp

@@ -7,8 +7,8 @@
 #include <sprout/numeric/fixed/adjacent_difference.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fit {

sprout/numeric/fit/partial_sum.hpp

@@ -7,8 +7,8 @@
 #include <sprout/numeric/fixed/partial_sum.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {
 	namespace fit {

sprout/string/char_traits.hpp

@@ -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)
 				);

sprout/string/string.hpp

@@ -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>

sprout/sub_array/comparison.hpp

@@ -4,7 +4,8 @@
 #include <sprout/config.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/sub_array/sub_array.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
+#include <sprout/algorithm/equal.hpp>
+#include <sprout/algorithm/lexicographical_compare.hpp>
 
 namespace sprout {
 	//
@@ -18,7 +19,7 @@ namespace sprout {
 	template<typename Container>
 	inline SPROUT_CONSTEXPR bool
 	operator==(sprout::sub_array<Container> const& lhs, sprout::sub_array<Container> const& rhs) {
-		return NS_SSCRISK_CEL_OR_SPROUT::equal(sprout::begin(lhs), sprout::end(lhs), sprout::begin(rhs));
+		return sprout::equal(sprout::begin(lhs), sprout::end(lhs), sprout::begin(rhs));
 	}
 	template<typename Container>
 	inline SPROUT_CONSTEXPR bool
@@ -28,7 +29,7 @@ namespace sprout {
 	template<typename Container>
 	inline SPROUT_CONSTEXPR bool
 	operator<(sprout::sub_array<Container> const& lhs, sprout::sub_array<Container> const& rhs) {
-		return NS_SSCRISK_CEL_OR_SPROUT::lexicographical_compare(
+		return sprout::lexicographical_compare(
 			sprout::begin(lhs), sprout::end(lhs),
 			sprout::begin(rhs), sprout::end(rhs)
 			);

sprout/uuid/string_generator.hpp

@@ -9,8 +9,8 @@
 #include <sprout/string.hpp>
 #include <sprout/uuid/uuid.hpp>
 #include <sprout/uuid/detail/table.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace uuids {
@@ -54,7 +54,7 @@ namespace sprout {
 				return value_at(
 					sprout::distance(
 						sprout::uuids::detail::digits<Elem>::table.begin(),
-						NS_SSCRISK_CEL_OR_SPROUT::find(
+						sprout::find(
 							sprout::uuids::detail::digits<Elem>::table.begin(),
 							sprout::uuids::detail::digits<Elem>::table.end(),
 							c

sprout/uuid/uuid.hpp

@@ -9,7 +9,8 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/reverse_iterator.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
+#include <sprout/algorithm/equal.hpp>
+#include <sprout/algorithm/lexicographical_compare.hpp>
 #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION
 #	include <sprout/iterator/index_iterator.hpp>
 #endif
@@ -233,7 +234,7 @@ namespace sprout {
 		//
 		inline SPROUT_CONSTEXPR bool
 		operator==(sprout::uuids::uuid const& lhs, sprout::uuids::uuid const& rhs) {
-			return NS_SSCRISK_CEL_OR_SPROUT::equal(lhs.begin(), lhs.end(), rhs.begin());
+			return sprout::equal(lhs.begin(), lhs.end(), rhs.begin());
 		}
 		inline SPROUT_CONSTEXPR bool
 		operator!=(sprout::uuids::uuid const& lhs, sprout::uuids::uuid const& rhs) {
@@ -241,7 +242,7 @@ namespace sprout {
 		}
 		inline SPROUT_CONSTEXPR bool
 		operator<(sprout::uuids::uuid const& lhs, sprout::uuids::uuid const& rhs) {
-			return NS_SSCRISK_CEL_OR_SPROUT::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+			return sprout::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
 		}
 		inline SPROUT_CONSTEXPR bool
 		operator>(sprout::uuids::uuid const& lhs, sprout::uuids::uuid const& rhs) {

sprout/weed/context/parse_context/terminal/string.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/begin.hpp>
 #include <sprout/container/end.hpp>
 #include <sprout/container/size.hpp>
-#include <sprout/iterator/next.hpp>
+#include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/equal.hpp>
 #include <sprout/tuple/tuple.hpp>
 #include <sprout/weed/eval_result.hpp>
 #include <sprout/weed/expr/tag.hpp>
@@ -14,8 +15,6 @@
 #include <sprout/weed/traits/expr/tag_of.hpp>
 #include <sprout/weed/traits/parser/attribute_of.hpp>
 #include <sprout/weed/context/parse_context_fwd.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
-#include <sprout/iterator/operation.hpp>
 
 namespace sprout {
 	namespace weed {
@@ -49,7 +48,7 @@ namespace sprout {
 				) const
 			{
 				return sprout::distance(ctx.begin(), ctx.end()) >= sprout::size(arg)
-					&&NS_SSCRISK_CEL_OR_SPROUT::equal(sprout::begin(arg), sprout::end(arg), ctx.begin())
+					&&sprout::equal(sprout::begin(arg), sprout::end(arg), ctx.begin())
 					? result_type(
 						true,
 						sprout::next(ctx.begin(),

sprout/weed/detail/bdigits.hpp

@@ -6,8 +6,8 @@
 #include <sprout/string.hpp>
 #include <sprout/array.hpp>
 #include <sprout/tuple/tuple.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace weed {
@@ -101,7 +101,7 @@ namespace sprout {
 				return sprout::weed::detail::bvalue_at<IntType>(
 					sprout::distance(
 						sprout::weed::detail::bdigits<Elem>::table.begin(),
-						NS_SSCRISK_CEL_OR_SPROUT::find(
+						sprout::find(
 							sprout::weed::detail::bdigits<Elem>::table.begin(),
 							sprout::weed::detail::bdigits<Elem>::table.end(),
 							c

sprout/weed/detail/digits.hpp

@@ -6,8 +6,8 @@
 #include <sprout/string.hpp>
 #include <sprout/array.hpp>
 #include <sprout/tuple/tuple.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace weed {
@@ -101,7 +101,7 @@ namespace sprout {
 				return sprout::weed::detail::value_at<IntType>(
 					sprout::distance(
 						sprout::weed::detail::digits<Elem>::table.begin(),
-						NS_SSCRISK_CEL_OR_SPROUT::find(
+						sprout::find(
 							sprout::weed::detail::digits<Elem>::table.begin(),
 							sprout::weed::detail::digits<Elem>::table.end(),
 							c

sprout/weed/detail/odigits.hpp

@@ -6,8 +6,8 @@
 #include <sprout/string.hpp>
 #include <sprout/array.hpp>
 #include <sprout/tuple/tuple.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace weed {
@@ -101,7 +101,7 @@ namespace sprout {
 				return sprout::weed::detail::ovalue_at<IntType>(
 					sprout::distance(
 						sprout::weed::detail::odigits<Elem>::table.begin(),
-						NS_SSCRISK_CEL_OR_SPROUT::find(
+						sprout::find(
 							sprout::weed::detail::odigits<Elem>::table.begin(),
 							sprout::weed::detail::odigits<Elem>::table.end(),
 							c

sprout/weed/detail/xdigits.hpp

@@ -6,8 +6,8 @@
 #include <sprout/string.hpp>
 #include <sprout/array.hpp>
 #include <sprout/tuple/tuple.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace weed {
@@ -101,7 +101,7 @@ namespace sprout {
 				return sprout::weed::detail::xvalue_at<IntType>(
 					sprout::distance(
 						sprout::weed::detail::xdigits<Elem>::table.begin(),
-						NS_SSCRISK_CEL_OR_SPROUT::find(
+						sprout::find(
 							sprout::weed::detail::xdigits<Elem>::table.begin(),
 							sprout::weed::detail::xdigits<Elem>::table.end(),
 							c

sprout/weed/parser/string/string.hpp

@@ -7,15 +7,14 @@
 #include <sprout/container/begin.hpp>
 #include <sprout/container/end.hpp>
 #include <sprout/container/size.hpp>
-#include <sprout/iterator/next.hpp>
+#include <sprout/iterator/operation.hpp>
+#include <sprout/algorithm/equal.hpp>
 #include <sprout/weed/unused.hpp>
 #include <sprout/weed/parser_result.hpp>
 #include <sprout/weed/parser/parser_base.hpp>
 #include <sprout/weed/parser/lit.hpp>
 #include <sprout/weed/traits/type/is_c_str.hpp>
 #include <sprout/weed/traits/type/is_string.hpp>
-#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
-#include <sprout/iterator/operation.hpp>
 
 namespace sprout {
 	namespace weed {
@@ -54,7 +53,7 @@ namespace sprout {
 				typedef typename result<Context, Iterator>::type result_type;
 				typedef typename attribute<Context, Iterator>::type attribute_type;
 				return sprout::distance(first, last) >= sprout::size(t_)
-					&&NS_SSCRISK_CEL_OR_SPROUT::equal(sprout::begin(t_), sprout::end(t_), first)
+					&& sprout::equal(sprout::begin(t_), sprout::end(t_), first)
 					? result_type(true, sprout::next(first, sprout::size(t_)), attribute_type())
 					: result_type(false, first, typename attribute<Context, Iterator>::type())
 					;
@@ -129,7 +128,7 @@ namespace sprout {
 				typedef typename result<Context, Iterator>::type result_type;
 				typedef typename attribute<Context, Iterator>::type attribute_type;
 				return sprout::distance(first, last) >= sprout::size(t_)
-					&&NS_SSCRISK_CEL_OR_SPROUT::equal(sprout::begin(t_), sprout::end(t_), first)
+					&& sprout::equal(sprout::begin(t_), sprout::end(t_), first)
 					? result_type(true, sprout::next(first, sprout::size(t_)), attribute_type())
 					: result_type(false, first, typename attribute<Context, Iterator>::type())
 					;