diff --git a/sprout/algorithm/fit/clamp_range_copy.hpp b/sprout/algorithm/fit/clamp_range_copy.hpp index 168787a4..608512ba 100644 --- a/sprout/algorithm/fit/clamp_range_copy.hpp +++ b/sprout/algorithm/fit/clamp_range_copy.hpp @@ -7,8 +7,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { namespace fit { diff --git a/sprout/algorithm/fixed/bogo_sort.hpp b/sprout/algorithm/fixed/bogo_sort.hpp index 6be6f1dc..a2e25080 100644 --- a/sprout/algorithm/fixed/bogo_sort.hpp +++ b/sprout/algorithm/fixed/bogo_sort.hpp @@ -7,9 +7,9 @@ #include #include #include +#include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { @@ -18,7 +18,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::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 inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::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 diff --git a/sprout/algorithm/fixed/bogo_sort_result.hpp b/sprout/algorithm/fixed/bogo_sort_result.hpp index 60d59282..96728ecc 100644 --- a/sprout/algorithm/fixed/bogo_sort_result.hpp +++ b/sprout/algorithm/fixed/bogo_sort_result.hpp @@ -8,9 +8,9 @@ #include #include #include +#include #include #include -#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::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::type, typename std::decay::type > result_type; - return NS_SSCRISK_CEL_OR_SPROUT::is_sorted( + return sprout::is_sorted( sprout::begin(cont), sprout::end(cont), comp diff --git a/sprout/algorithm/fixed/bozo_sort.hpp b/sprout/algorithm/fixed/bozo_sort.hpp index c56e4c1e..84132ca0 100644 --- a/sprout/algorithm/fixed/bozo_sort.hpp +++ b/sprout/algorithm/fixed/bozo_sort.hpp @@ -7,9 +7,9 @@ #include #include #include +#include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { @@ -18,7 +18,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::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 inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::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 diff --git a/sprout/algorithm/fixed/bozo_sort_result.hpp b/sprout/algorithm/fixed/bozo_sort_result.hpp index f4a53e34..a63987e9 100644 --- a/sprout/algorithm/fixed/bozo_sort_result.hpp +++ b/sprout/algorithm/fixed/bozo_sort_result.hpp @@ -8,9 +8,9 @@ #include #include #include +#include #include #include -#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::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::type, typename std::decay::type > result_type; - return NS_SSCRISK_CEL_OR_SPROUT::is_sorted( + return sprout::is_sorted( sprout::begin(cont), sprout::end(cont), comp diff --git a/sprout/algorithm/fixed/copy_until.hpp b/sprout/algorithm/fixed/copy_until.hpp index a3d3a1f1..03bfb09c 100644 --- a/sprout/algorithm/fixed/copy_until.hpp +++ b/sprout/algorithm/fixed/copy_until.hpp @@ -7,10 +7,10 @@ #include #include #include +#include #include #include #include -#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 inline SPROUT_CONSTEXPR typename std::enable_if< diff --git a/sprout/algorithm/fixed/copy_while.hpp b/sprout/algorithm/fixed/copy_while.hpp index f595d3cf..93d623c8 100644 --- a/sprout/algorithm/fixed/copy_while.hpp +++ b/sprout/algorithm/fixed/copy_while.hpp @@ -7,10 +7,10 @@ #include #include #include +#include #include #include #include -#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 inline SPROUT_CONSTEXPR typename std::enable_if< diff --git a/sprout/array/array.hpp b/sprout/array/array.hpp index 8abe4467..459d235d 100644 --- a/sprout/array/array.hpp +++ b/sprout/array/array.hpp @@ -11,7 +11,6 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION # include #endif diff --git a/sprout/array/comparison.hpp b/sprout/array/comparison.hpp index 2536bd2d..db423b18 100644 --- a/sprout/array/comparison.hpp +++ b/sprout/array/comparison.hpp @@ -4,7 +4,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT +#include +#include namespace sprout { // @@ -18,7 +19,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR bool operator==(sprout::array const& lhs, sprout::array 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 inline SPROUT_CONSTEXPR bool @@ -28,7 +29,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR bool operator<(sprout::array const& lhs, sprout::array 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 inline SPROUT_CONSTEXPR bool diff --git a/sprout/bitset/bitset.hpp b/sprout/bitset/bitset.hpp index 0d0c8eca..bdae9193 100644 --- a/sprout/bitset/bitset.hpp +++ b/sprout/bitset/bitset.hpp @@ -11,14 +11,17 @@ #include #include #include +#include +#include +#include +#include #include #include +#include #include #include #include #include -#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 const& x) const SPROUT_NOEXCEPT { - return NS_SSCRISK_CEL_OR_SPROUT::equal(begin(), end(), x.begin()); + return sprout::equal(begin(), end(), x.begin()); } template 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(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(0), count_op()); + return sprout::accumulate(begin(), end(), static_cast(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 , diff --git a/sprout/cstring/memchr.hpp b/sprout/cstring/memchr.hpp index de47093c..902818fa 100644 --- a/sprout/cstring/memchr.hpp +++ b/sprout/cstring/memchr.hpp @@ -4,7 +4,7 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT +#include 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(s)), sprout::as_iterator(static_cast(s), n), static_cast(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(s)), sprout::as_iterator(static_cast(s), n), static_cast(c) ) diff --git a/sprout/cstring/strlen.hpp b/sprout/cstring/strlen.hpp index f2c792aa..9d9a4ca6 100644 --- a/sprout/cstring/strlen.hpp +++ b/sprout/cstring/strlen.hpp @@ -4,8 +4,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include namespace sprout { // 7.21.6.3 strlen ֐ @@ -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 diff --git a/sprout/cstring/strncmp.hpp b/sprout/cstring/strncmp.hpp index e2ed314e..b213f823 100644 --- a/sprout/cstring/strncmp.hpp +++ b/sprout/cstring/strncmp.hpp @@ -5,7 +5,6 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { // 7.21.4.4 strncmp ֐ diff --git a/sprout/cwchar/wcslen.hpp b/sprout/cwchar/wcslen.hpp index 36b8c57c..ce6440f3 100644 --- a/sprout/cwchar/wcslen.hpp +++ b/sprout/cwchar/wcslen.hpp @@ -4,8 +4,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include 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 diff --git a/sprout/cwchar/wcsncmp.hpp b/sprout/cwchar/wcsncmp.hpp index 5ea05182..1973ab39 100644 --- a/sprout/cwchar/wcsncmp.hpp +++ b/sprout/cwchar/wcsncmp.hpp @@ -5,7 +5,6 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { // diff --git a/sprout/cwchar/wmemchr.hpp b/sprout/cwchar/wmemchr.hpp index e77638bd..4d62d2eb 100644 --- a/sprout/cwchar/wmemchr.hpp +++ b/sprout/cwchar/wmemchr.hpp @@ -4,7 +4,7 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT +#include 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 ) diff --git a/sprout/numeric/dft/fit/amplitude_spectrum.hpp b/sprout/numeric/dft/fit/amplitude_spectrum.hpp index c2ee0a8a..d878e7e3 100644 --- a/sprout/numeric/dft/fit/amplitude_spectrum.hpp +++ b/sprout/numeric/dft/fit/amplitude_spectrum.hpp @@ -7,8 +7,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { namespace fit { diff --git a/sprout/numeric/dft/fit/dft.hpp b/sprout/numeric/dft/fit/dft.hpp index 361d4ebc..e7174207 100644 --- a/sprout/numeric/dft/fit/dft.hpp +++ b/sprout/numeric/dft/fit/dft.hpp @@ -7,8 +7,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { namespace fit { diff --git a/sprout/numeric/dft/fit/idft.hpp b/sprout/numeric/dft/fit/idft.hpp index 2b790188..70ef18e9 100644 --- a/sprout/numeric/dft/fit/idft.hpp +++ b/sprout/numeric/dft/fit/idft.hpp @@ -7,8 +7,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { namespace fit { diff --git a/sprout/numeric/dft/fit/phase_spectrum.hpp b/sprout/numeric/dft/fit/phase_spectrum.hpp index c493bb1d..15dc20f6 100644 --- a/sprout/numeric/dft/fit/phase_spectrum.hpp +++ b/sprout/numeric/dft/fit/phase_spectrum.hpp @@ -7,8 +7,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { namespace fit { diff --git a/sprout/numeric/fit/adjacent_difference.hpp b/sprout/numeric/fit/adjacent_difference.hpp index 3841e6bd..d31a5f6b 100644 --- a/sprout/numeric/fit/adjacent_difference.hpp +++ b/sprout/numeric/fit/adjacent_difference.hpp @@ -7,8 +7,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { namespace fit { diff --git a/sprout/numeric/fit/partial_sum.hpp b/sprout/numeric/fit/partial_sum.hpp index 8a6ffa70..033d24ac 100644 --- a/sprout/numeric/fit/partial_sum.hpp +++ b/sprout/numeric/fit/partial_sum.hpp @@ -7,8 +7,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { namespace fit { diff --git a/sprout/string/char_traits.hpp b/sprout/string/char_traits.hpp index f3ad34f0..617b1b0a 100644 --- a/sprout/string/char_traits.hpp +++ b/sprout/string/char_traits.hpp @@ -7,8 +7,8 @@ #include #include #include +#include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include 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 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 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) ); diff --git a/sprout/string/string.hpp b/sprout/string/string.hpp index 6060b5b7..8e6a64c3 100644 --- a/sprout/string/string.hpp +++ b/sprout/string/string.hpp @@ -10,12 +10,13 @@ #include #include #include +#include +#include #include #include #include #include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT -#include #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION # include #endif @@ -823,7 +824,7 @@ namespace sprout { length_impl(sprout::array 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 diff --git a/sprout/sub_array/comparison.hpp b/sprout/sub_array/comparison.hpp index 37729390..8fbab14d 100644 --- a/sprout/sub_array/comparison.hpp +++ b/sprout/sub_array/comparison.hpp @@ -4,7 +4,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT +#include +#include namespace sprout { // @@ -18,7 +19,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR bool operator==(sprout::sub_array const& lhs, sprout::sub_array 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 inline SPROUT_CONSTEXPR bool @@ -28,7 +29,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR bool operator<(sprout::sub_array const& lhs, sprout::sub_array 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) ); diff --git a/sprout/uuid/string_generator.hpp b/sprout/uuid/string_generator.hpp index ef7deda3..36325a11 100644 --- a/sprout/uuid/string_generator.hpp +++ b/sprout/uuid/string_generator.hpp @@ -9,8 +9,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include namespace sprout { namespace uuids { @@ -54,7 +54,7 @@ namespace sprout { return value_at( sprout::distance( sprout::uuids::detail::digits::table.begin(), - NS_SSCRISK_CEL_OR_SPROUT::find( + sprout::find( sprout::uuids::detail::digits::table.begin(), sprout::uuids::detail::digits::table.end(), c diff --git a/sprout/uuid/uuid.hpp b/sprout/uuid/uuid.hpp index edc8def7..eb005363 100644 --- a/sprout/uuid/uuid.hpp +++ b/sprout/uuid/uuid.hpp @@ -9,7 +9,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT +#include +#include #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION # include #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) { diff --git a/sprout/weed/context/parse_context/terminal/string.hpp b/sprout/weed/context/parse_context/terminal/string.hpp index 5a094048..31457d2f 100644 --- a/sprout/weed/context/parse_context/terminal/string.hpp +++ b/sprout/weed/context/parse_context/terminal/string.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -14,8 +15,6 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT -#include 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(), diff --git a/sprout/weed/detail/bdigits.hpp b/sprout/weed/detail/bdigits.hpp index cb3f4076..3b63f9a3 100644 --- a/sprout/weed/detail/bdigits.hpp +++ b/sprout/weed/detail/bdigits.hpp @@ -6,8 +6,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include namespace sprout { namespace weed { @@ -101,7 +101,7 @@ namespace sprout { return sprout::weed::detail::bvalue_at( sprout::distance( sprout::weed::detail::bdigits::table.begin(), - NS_SSCRISK_CEL_OR_SPROUT::find( + sprout::find( sprout::weed::detail::bdigits::table.begin(), sprout::weed::detail::bdigits::table.end(), c diff --git a/sprout/weed/detail/digits.hpp b/sprout/weed/detail/digits.hpp index 984ba502..a56ad241 100644 --- a/sprout/weed/detail/digits.hpp +++ b/sprout/weed/detail/digits.hpp @@ -6,8 +6,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include namespace sprout { namespace weed { @@ -101,7 +101,7 @@ namespace sprout { return sprout::weed::detail::value_at( sprout::distance( sprout::weed::detail::digits::table.begin(), - NS_SSCRISK_CEL_OR_SPROUT::find( + sprout::find( sprout::weed::detail::digits::table.begin(), sprout::weed::detail::digits::table.end(), c diff --git a/sprout/weed/detail/odigits.hpp b/sprout/weed/detail/odigits.hpp index b6678f9e..0c59b129 100644 --- a/sprout/weed/detail/odigits.hpp +++ b/sprout/weed/detail/odigits.hpp @@ -6,8 +6,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include namespace sprout { namespace weed { @@ -101,7 +101,7 @@ namespace sprout { return sprout::weed::detail::ovalue_at( sprout::distance( sprout::weed::detail::odigits::table.begin(), - NS_SSCRISK_CEL_OR_SPROUT::find( + sprout::find( sprout::weed::detail::odigits::table.begin(), sprout::weed::detail::odigits::table.end(), c diff --git a/sprout/weed/detail/xdigits.hpp b/sprout/weed/detail/xdigits.hpp index 2b6033d4..8b6f3762 100644 --- a/sprout/weed/detail/xdigits.hpp +++ b/sprout/weed/detail/xdigits.hpp @@ -6,8 +6,8 @@ #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include +#include namespace sprout { namespace weed { @@ -101,7 +101,7 @@ namespace sprout { return sprout::weed::detail::xvalue_at( sprout::distance( sprout::weed::detail::xdigits::table.begin(), - NS_SSCRISK_CEL_OR_SPROUT::find( + sprout::find( sprout::weed::detail::xdigits::table.begin(), sprout::weed::detail::xdigits::table.end(), c diff --git a/sprout/weed/parser/string/string.hpp b/sprout/weed/parser/string/string.hpp index 80bc5641..270fd5b0 100644 --- a/sprout/weed/parser/string/string.hpp +++ b/sprout/weed/parser/string/string.hpp @@ -7,15 +7,14 @@ #include #include #include -#include +#include +#include #include #include #include #include #include #include -#include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT -#include namespace sprout { namespace weed { @@ -54,7 +53,7 @@ namespace sprout { typedef typename result::type result_type; typedef typename attribute::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::type()) ; @@ -129,7 +128,7 @@ namespace sprout { typedef typename result::type result_type; typedef typename attribute::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::type()) ;