From bf0c7021cfe04f6391717c2c7d2231aa095609b1 Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Wed, 20 Nov 2013 22:04:11 +0900 Subject: [PATCH] modify namespace result_of -> results support C++14 type_traits --- libs/array/test/array.cpp | 4 +- libs/tuple/test/tuple.cpp | 2 +- sprout/algorithm/fit/bogo_sort.hpp | 10 +- sprout/algorithm/fit/bogo_sort_result.hpp | 14 +- sprout/algorithm/fit/bozo_sort.hpp | 10 +- sprout/algorithm/fit/bozo_sort_result.hpp | 14 +- sprout/algorithm/fit/clamp_range.hpp | 10 +- sprout/algorithm/fit/clamp_range_copy.hpp | 10 +- sprout/algorithm/fit/copy.hpp | 6 +- sprout/algorithm/fit/copy_backward.hpp | 6 +- sprout/algorithm/fit/copy_if.hpp | 6 +- sprout/algorithm/fit/copy_n.hpp | 6 +- sprout/algorithm/fit/copy_until.hpp | 6 +- sprout/algorithm/fit/copy_while.hpp | 6 +- sprout/algorithm/fit/fill.hpp | 6 +- sprout/algorithm/fit/fill_n.hpp | 6 +- sprout/algorithm/fit/generate.hpp | 6 +- sprout/algorithm/fit/generate_n.hpp | 6 +- sprout/algorithm/fit/inplace_merge.hpp | 10 +- sprout/algorithm/fit/make_heap.hpp | 10 +- sprout/algorithm/fit/make_partial_heap.hpp | 10 +- sprout/algorithm/fit/merge.hpp | 10 +- sprout/algorithm/fit/next_permutation.hpp | 14 +- sprout/algorithm/fit/nth_element.hpp | 10 +- sprout/algorithm/fit/partial_sort.hpp | 10 +- sprout/algorithm/fit/partition.hpp | 6 +- sprout/algorithm/fit/partition_copy.hpp | 6 +- sprout/algorithm/fit/pop_heap.hpp | 10 +- sprout/algorithm/fit/prev_permutation.hpp | 14 +- sprout/algorithm/fit/push_heap.hpp | 10 +- sprout/algorithm/fit/random_swap.hpp | 6 +- sprout/algorithm/fit/random_swap_result.hpp | 10 +- sprout/algorithm/fit/recurrence.hpp | 6 +- sprout/algorithm/fit/recurrence_n.hpp | 6 +- sprout/algorithm/fit/remove.hpp | 6 +- sprout/algorithm/fit/remove_copy.hpp | 6 +- sprout/algorithm/fit/remove_copy_if.hpp | 6 +- sprout/algorithm/fit/remove_if.hpp | 6 +- sprout/algorithm/fit/replace.hpp | 6 +- sprout/algorithm/fit/replace_copy.hpp | 6 +- sprout/algorithm/fit/replace_copy_if.hpp | 6 +- sprout/algorithm/fit/replace_if.hpp | 6 +- .../fit/{result_of.hpp => results.hpp} | 8 +- sprout/algorithm/fit/reverse.hpp | 6 +- sprout/algorithm/fit/reverse_copy.hpp | 6 +- sprout/algorithm/fit/rotate.hpp | 6 +- sprout/algorithm/fit/rotate_copy.hpp | 6 +- sprout/algorithm/fit/set_difference.hpp | 10 +- sprout/algorithm/fit/set_intersection.hpp | 10 +- .../fit/set_symmetric_difference.hpp | 10 +- sprout/algorithm/fit/set_union.hpp | 10 +- sprout/algorithm/fit/shuffle.hpp | 6 +- sprout/algorithm/fit/shuffle_result.hpp | 10 +- sprout/algorithm/fit/sort.hpp | 10 +- sprout/algorithm/fit/sort_heap.hpp | 10 +- sprout/algorithm/fit/stable_partition.hpp | 6 +- .../algorithm/fit/stable_partition_copy.hpp | 6 +- sprout/algorithm/fit/stable_sort.hpp | 10 +- sprout/algorithm/fit/swap_element.hpp | 6 +- sprout/algorithm/fit/swap_element_copy.hpp | 6 +- sprout/algorithm/fit/transform.hpp | 10 +- sprout/algorithm/fit/unfold.hpp | 6 +- sprout/algorithm/fit/unfold_n.hpp | 6 +- sprout/algorithm/fit/unique.hpp | 10 +- sprout/algorithm/fit/unique_copy.hpp | 10 +- sprout/algorithm/fixed/bogo_sort.hpp | 6 +- sprout/algorithm/fixed/bogo_sort_result.hpp | 10 +- sprout/algorithm/fixed/bozo_sort.hpp | 6 +- sprout/algorithm/fixed/bozo_sort_result.hpp | 10 +- sprout/algorithm/fixed/clamp_range.hpp | 6 +- sprout/algorithm/fixed/clamp_range_copy.hpp | 24 +- sprout/algorithm/fixed/copy.hpp | 24 +- sprout/algorithm/fixed/copy_backward.hpp | 22 +- sprout/algorithm/fixed/copy_if.hpp | 18 +- sprout/algorithm/fixed/copy_n.hpp | 22 +- sprout/algorithm/fixed/copy_until.hpp | 18 +- sprout/algorithm/fixed/copy_while.hpp | 18 +- sprout/algorithm/fixed/deprecated/sort.hpp | 30 +- sprout/algorithm/fixed/fill.hpp | 12 +- sprout/algorithm/fixed/fill_n.hpp | 14 +- sprout/algorithm/fixed/generate.hpp | 14 +- sprout/algorithm/fixed/generate_n.hpp | 10 +- sprout/algorithm/fixed/inplace_merge.hpp | 6 +- sprout/algorithm/fixed/make_heap.hpp | 24 +- sprout/algorithm/fixed/make_partial_heap.hpp | 10 +- sprout/algorithm/fixed/merge.hpp | 18 +- sprout/algorithm/fixed/next_permutation.hpp | 10 +- sprout/algorithm/fixed/nth_element.hpp | 10 +- sprout/algorithm/fixed/partial_sort.hpp | 8 +- sprout/algorithm/fixed/partition.hpp | 4 +- sprout/algorithm/fixed/partition_copy.hpp | 10 +- sprout/algorithm/fixed/pop_heap.hpp | 8 +- sprout/algorithm/fixed/prev_permutation.hpp | 10 +- sprout/algorithm/fixed/push_heap.hpp | 8 +- sprout/algorithm/fixed/random_swap.hpp | 8 +- sprout/algorithm/fixed/random_swap_result.hpp | 10 +- sprout/algorithm/fixed/recurrence.hpp | 20 +- sprout/algorithm/fixed/recurrence_n.hpp | 6 +- sprout/algorithm/fixed/remove.hpp | 4 +- sprout/algorithm/fixed/remove_copy.hpp | 18 +- sprout/algorithm/fixed/remove_copy_if.hpp | 18 +- sprout/algorithm/fixed/remove_if.hpp | 4 +- sprout/algorithm/fixed/replace.hpp | 4 +- sprout/algorithm/fixed/replace_copy.hpp | 24 +- sprout/algorithm/fixed/replace_copy_if.hpp | 24 +- sprout/algorithm/fixed/replace_if.hpp | 4 +- .../fixed/{result_of.hpp => results.hpp} | 14 +- sprout/algorithm/fixed/reverse.hpp | 4 +- sprout/algorithm/fixed/reverse_copy.hpp | 24 +- sprout/algorithm/fixed/rotate.hpp | 4 +- sprout/algorithm/fixed/rotate_copy.hpp | 28 +- sprout/algorithm/fixed/set_difference.hpp | 18 +- sprout/algorithm/fixed/set_intersection.hpp | 18 +- .../fixed/set_symmetric_difference.hpp | 18 +- sprout/algorithm/fixed/set_union.hpp | 18 +- sprout/algorithm/fixed/shuffle.hpp | 8 +- sprout/algorithm/fixed/shuffle_result.hpp | 10 +- sprout/algorithm/fixed/sort.hpp | 6 +- sprout/algorithm/fixed/sort_heap.hpp | 8 +- sprout/algorithm/fixed/stable_partition.hpp | 4 +- .../algorithm/fixed/stable_partition_copy.hpp | 14 +- sprout/algorithm/fixed/stable_sort.hpp | 28 +- sprout/algorithm/fixed/swap_element.hpp | 4 +- sprout/algorithm/fixed/swap_element_copy.hpp | 16 +- sprout/algorithm/fixed/transform.hpp | 46 +- sprout/algorithm/fixed/unfold.hpp | 14 +- sprout/algorithm/fixed/unfold_n.hpp | 6 +- sprout/algorithm/fixed/unique.hpp | 4 +- sprout/algorithm/fixed/unique_copy.hpp | 34 +- sprout/algorithm/none_of.hpp | 2 +- sprout/algorithm/string/fit/to_lower.hpp | 6 +- sprout/algorithm/string/fit/to_lower_copy.hpp | 6 +- sprout/algorithm/string/fit/to_upper.hpp | 6 +- sprout/algorithm/string/fit/to_upper_copy.hpp | 6 +- sprout/algorithm/string/fixed/to_lower.hpp | 4 +- .../algorithm/string/fixed/to_lower_copy.hpp | 6 +- sprout/algorithm/string/fixed/to_upper.hpp | 4 +- .../algorithm/string/fixed/to_upper_copy.hpp | 6 +- sprout/algorithm/string/join.hpp | 24 +- sprout/array/type_traits.hpp | 14 +- sprout/bit/length.hpp | 4 +- sprout/bit/reverse.hpp | 4 +- sprout/bitset/bitset.hpp | 4 +- sprout/brainfuck/brainfuck.hpp | 16 +- sprout/brainfuck/detail/convert.hpp | 8 +- sprout/brainfuck/misa.hpp | 10 +- sprout/brainfuck/ook.hpp | 10 +- sprout/compost/utility/iir_filter.hpp | 82 +-- sprout/cstdint.hpp | 3 +- sprout/detail/container_complate.hpp | 14 +- sprout/detail/container_complate_backward.hpp | 14 +- sprout/detail/predef.hpp | 123 +++++ sprout/functional/hash/hash_value_traits.hpp | 6 +- sprout/numeric/dft/fit/amplitude_spectrum.hpp | 8 +- sprout/numeric/dft/fit/dft.hpp | 8 +- sprout/numeric/dft/fit/idft.hpp | 8 +- sprout/numeric/dft/fit/phase_spectrum.hpp | 8 +- sprout/numeric/dft/fit/sawtooth.hpp | 8 +- sprout/numeric/dft/fit/sinusoid.hpp | 8 +- sprout/numeric/dft/fit/spectrum.hpp | 6 +- sprout/numeric/dft/fit/square.hpp | 8 +- sprout/numeric/dft/fit/triangle.hpp | 8 +- .../numeric/dft/fixed/amplitude_spectrum.hpp | 20 +- sprout/numeric/dft/fixed/dft.hpp | 20 +- sprout/numeric/dft/fixed/idft.hpp | 20 +- sprout/numeric/dft/fixed/phase_spectrum.hpp | 20 +- sprout/numeric/dft/fixed/sawtooth.hpp | 10 +- sprout/numeric/dft/fixed/sinusoid.hpp | 10 +- sprout/numeric/dft/fixed/spectrum.hpp | 6 +- sprout/numeric/dft/fixed/square.hpp | 10 +- sprout/numeric/dft/fixed/triangle.hpp | 10 +- sprout/numeric/fft/fit/bitrev_table.hpp | 6 +- sprout/numeric/fft/fixed/bitrev_table.hpp | 6 +- sprout/numeric/fit/adjacent_difference.hpp | 10 +- sprout/numeric/fit/iota.hpp | 6 +- sprout/numeric/fit/partial_sum.hpp | 10 +- sprout/numeric/fixed/adjacent_difference.hpp | 26 +- sprout/numeric/fixed/iota.hpp | 12 +- sprout/numeric/fixed/partial_sum.hpp | 26 +- sprout/operation/fit/append.hpp | 10 +- sprout/operation/fit/append_back.hpp | 8 +- sprout/operation/fit/append_front.hpp | 8 +- sprout/operation/fit/erase.hpp | 10 +- sprout/operation/fit/erase_n.hpp | 10 +- sprout/operation/fit/insert.hpp | 10 +- sprout/operation/fit/insert_n.hpp | 10 +- sprout/operation/fit/pop_back.hpp | 8 +- sprout/operation/fit/pop_back_n.hpp | 8 +- sprout/operation/fit/pop_front.hpp | 8 +- sprout/operation/fit/pop_front_n.hpp | 8 +- sprout/operation/fit/push_back.hpp | 8 +- sprout/operation/fit/push_back_n.hpp | 8 +- sprout/operation/fit/push_front.hpp | 8 +- sprout/operation/fit/push_front_n.hpp | 8 +- sprout/operation/fit/realign.hpp | 10 +- sprout/operation/fit/realign_to.hpp | 10 +- sprout/operation/fit/resize.hpp | 14 +- sprout/operation/fit/resize_backward.hpp | 14 +- sprout/operation/fit/set.hpp | 10 +- sprout/operation/fixed/append.hpp | 22 +- sprout/operation/fixed/append_back.hpp | 18 +- sprout/operation/fixed/append_front.hpp | 18 +- sprout/operation/fixed/erase.hpp | 22 +- sprout/operation/fixed/erase_n.hpp | 22 +- sprout/operation/fixed/insert.hpp | 22 +- sprout/operation/fixed/insert_n.hpp | 22 +- sprout/operation/fixed/pop_back.hpp | 18 +- sprout/operation/fixed/pop_back_n.hpp | 18 +- sprout/operation/fixed/pop_front.hpp | 18 +- sprout/operation/fixed/pop_front_n.hpp | 18 +- sprout/operation/fixed/push_back.hpp | 18 +- sprout/operation/fixed/push_back_n.hpp | 18 +- sprout/operation/fixed/push_front.hpp | 18 +- sprout/operation/fixed/push_front_n.hpp | 18 +- sprout/operation/fixed/realign.hpp | 22 +- sprout/operation/fixed/realign_to.hpp | 22 +- sprout/operation/fixed/resize.hpp | 22 +- sprout/operation/fixed/resize_backward.hpp | 28 +- sprout/operation/fixed/set.hpp | 22 +- sprout/optional/optional.hpp | 3 +- sprout/random/seed_array.hpp | 30 +- sprout/range/adaptor/copied.hpp | 4 +- .../range/algorithm/fit/clamp_range_copy.hpp | 6 +- sprout/range/algorithm/fit/copy.hpp | 4 +- sprout/range/algorithm/fit/copy_backward.hpp | 4 +- sprout/range/algorithm/fit/copy_if.hpp | 4 +- sprout/range/algorithm/fit/copy_until.hpp | 4 +- sprout/range/algorithm/fit/copy_while.hpp | 4 +- sprout/range/algorithm/fit/merge.hpp | 6 +- sprout/range/algorithm/fit/partition_copy.hpp | 4 +- sprout/range/algorithm/fit/remove_copy.hpp | 4 +- sprout/range/algorithm/fit/remove_copy_if.hpp | 4 +- sprout/range/algorithm/fit/replace_copy.hpp | 4 +- .../range/algorithm/fit/replace_copy_if.hpp | 4 +- sprout/range/algorithm/fit/reverse_copy.hpp | 4 +- sprout/range/algorithm/fit/rotate_copy.hpp | 4 +- sprout/range/algorithm/fit/set_difference.hpp | 6 +- .../range/algorithm/fit/set_intersection.hpp | 6 +- .../fit/set_symmetric_difference.hpp | 6 +- sprout/range/algorithm/fit/set_union.hpp | 6 +- .../algorithm/fit/stable_partition_copy.hpp | 4 +- .../range/algorithm/fit/swap_element_copy.hpp | 4 +- sprout/range/algorithm/fit/transform.hpp | 6 +- sprout/range/algorithm/fit/unique_copy.hpp | 6 +- .../algorithm/fixed/clamp_range_copy.hpp | 10 +- sprout/range/algorithm/fixed/copy.hpp | 6 +- .../range/algorithm/fixed/copy_backward.hpp | 6 +- sprout/range/algorithm/fixed/copy_if.hpp | 6 +- sprout/range/algorithm/fixed/copy_until.hpp | 6 +- sprout/range/algorithm/fixed/copy_while.hpp | 6 +- sprout/range/algorithm/fixed/merge.hpp | 10 +- .../range/algorithm/fixed/partition_copy.hpp | 6 +- sprout/range/algorithm/fixed/remove_copy.hpp | 6 +- .../range/algorithm/fixed/remove_copy_if.hpp | 6 +- sprout/range/algorithm/fixed/replace_copy.hpp | 6 +- .../range/algorithm/fixed/replace_copy_if.hpp | 6 +- sprout/range/algorithm/fixed/reverse_copy.hpp | 6 +- sprout/range/algorithm/fixed/rotate_copy.hpp | 6 +- .../range/algorithm/fixed/set_difference.hpp | 10 +- .../algorithm/fixed/set_intersection.hpp | 10 +- .../fixed/set_symmetric_difference.hpp | 10 +- sprout/range/algorithm/fixed/set_union.hpp | 10 +- .../algorithm/fixed/stable_partition_copy.hpp | 6 +- .../algorithm/fixed/swap_element_copy.hpp | 6 +- sprout/range/algorithm/fixed/transform.hpp | 10 +- sprout/range/algorithm/fixed/unique_copy.hpp | 10 +- .../algorithm/string/fit/to_lower_copy.hpp | 4 +- .../algorithm/string/fit/to_upper_copy.hpp | 4 +- .../algorithm/string/fixed/to_lower_copy.hpp | 6 +- .../algorithm/string/fixed/to_upper_copy.hpp | 6 +- .../numeric/dft/fit/amplitude_spectrum.hpp | 6 +- sprout/range/numeric/dft/fit/dft.hpp | 6 +- sprout/range/numeric/dft/fit/idft.hpp | 6 +- .../range/numeric/dft/fit/phase_spectrum.hpp | 6 +- sprout/range/numeric/dft/fit/spectrum.hpp | 6 +- .../numeric/dft/fixed/amplitude_spectrum.hpp | 6 +- sprout/range/numeric/dft/fixed/dft.hpp | 6 +- sprout/range/numeric/dft/fixed/idft.hpp | 6 +- .../numeric/dft/fixed/phase_spectrum.hpp | 6 +- sprout/range/numeric/dft/fixed/spectrum.hpp | 6 +- .../range/numeric/fit/adjacent_difference.hpp | 10 +- sprout/range/numeric/fit/partial_sum.hpp | 10 +- .../numeric/fixed/adjacent_difference.hpp | 10 +- sprout/range/numeric/fixed/partial_sum.hpp | 10 +- sprout/tpp/algorithm.hpp | 2 + sprout/tpp/algorithm/all_of.hpp | 11 +- sprout/tpp/algorithm/any_of.hpp | 12 +- sprout/tpp/algorithm/max_element.hpp | 50 ++ sprout/tpp/algorithm/min_element.hpp | 50 ++ sprout/tpp/algorithm/none_of.hpp | 12 +- sprout/tpp/algorithm/one_of.hpp | 10 +- sprout/tuple/algorithm/copy.hpp | 14 +- sprout/tuple/operation/append_back.hpp | 8 +- sprout/tuple/operation/append_front.hpp | 8 +- sprout/tuple/operation/pop_back.hpp | 8 +- sprout/tuple/operation/pop_front.hpp | 8 +- sprout/tuple/operation/push_back.hpp | 8 +- sprout/tuple/operation/push_front.hpp | 8 +- sprout/tuple/tuple/make_tuple.hpp | 18 +- sprout/tuple/tuple/tuple_decl.hpp | 3 +- sprout/type_traits.hpp | 2 +- sprout/type_traits/aliases.hpp | 172 ------- sprout/type_traits/arithmetic_promote.hpp | 14 +- sprout/type_traits/const_reference.hpp | 8 +- .../detail/type_traits_wrapper.hpp | 27 + sprout/type_traits/enabler_if.hpp | 4 +- sprout/type_traits/float_promote.hpp | 20 +- sprout/type_traits/has_xxx.hpp | 27 +- sprout/type_traits/inherit_if_xxx.hpp | 16 +- sprout/type_traits/integral_constant.hpp | 43 ++ sprout/type_traits/is_c_str.hpp | 11 +- sprout/type_traits/is_char_type.hpp | 12 +- .../type_traits/is_convert_constructible.hpp | 6 +- sprout/type_traits/is_int.hpp | 8 +- sprout/type_traits/is_uint.hpp | 7 +- sprout/type_traits/remove_cvref.hpp | 6 +- sprout/type_traits/remove_shallow_const.hpp | 4 +- sprout/type_traits/remove_shallow_cv.hpp | 8 +- sprout/type_traits/remove_shallow_cvref.hpp | 3 +- .../type_traits/remove_shallow_volatile.hpp | 4 +- sprout/type_traits/std.hpp | 16 + sprout/type_traits/std_type_aliases.hpp | 90 ++++ sprout/type_traits/std_type_traits.hpp | 479 ++++++++++++++++++ sprout/utility/pair/pair.hpp | 14 +- sprout/utility/pair/pair_decl.hpp | 4 +- sprout/utility/pair/pair_fwd.hpp | 2 +- sprout/utility/rel_ops.hpp | 8 +- sprout/variant/get.hpp | 12 +- sprout/weed/attr_cnv/bitwise_or.hpp | 50 +- sprout/weed/attr_cnv/mem_ptr.hpp | 4 +- sprout/weed/attr_cnv/modulus.hpp | 4 +- sprout/weed/attr_cnv/negate.hpp | 4 +- .../attr_cnv/{result_of.hpp => results.hpp} | 12 +- .../{result_of => results}/bitwise_or.hpp | 4 +- .../{result_of => results}/mem_ptr.hpp | 4 +- .../{result_of => results}/modulus.hpp | 8 +- .../{result_of => results}/negate.hpp | 4 +- .../{result_of => results}/shift_left.hpp | 16 +- .../attr_cnv/{result_of => results}/times.hpp | 6 +- sprout/weed/attr_cnv/shift_left.hpp | 28 +- sprout/weed/attr_cnv/times.hpp | 10 +- .../parse_context/operator/bitwise_or.hpp | 4 +- .../parse_context/operator/dereference.hpp | 4 +- .../parse_context/operator/mem_ptr.hpp | 4 +- .../parse_context/operator/modulus.hpp | 4 +- .../context/parse_context/operator/negate.hpp | 4 +- .../parse_context/operator/shift_left.hpp | 4 +- .../parse_context/operator/unary_plus.hpp | 4 +- sprout/weed/parser/directive/repeat.hpp | 4 +- tools/testspr/test.cpp | 2 +- 350 files changed, 2628 insertions(+), 1912 deletions(-) rename sprout/algorithm/fit/{result_of.hpp => results.hpp} (83%) rename sprout/algorithm/fixed/{result_of.hpp => results.hpp} (79%) create mode 100644 sprout/detail/predef.hpp create mode 100644 sprout/tpp/algorithm/max_element.hpp create mode 100644 sprout/tpp/algorithm/min_element.hpp delete mode 100644 sprout/type_traits/aliases.hpp create mode 100644 sprout/type_traits/detail/type_traits_wrapper.hpp create mode 100644 sprout/type_traits/integral_constant.hpp create mode 100644 sprout/type_traits/std.hpp create mode 100644 sprout/type_traits/std_type_aliases.hpp create mode 100644 sprout/type_traits/std_type_traits.hpp rename sprout/weed/attr_cnv/{result_of.hpp => results.hpp} (62%) rename sprout/weed/attr_cnv/{result_of => results}/bitwise_or.hpp (95%) rename sprout/weed/attr_cnv/{result_of => results}/mem_ptr.hpp (91%) rename sprout/weed/attr_cnv/{result_of => results}/modulus.hpp (81%) rename sprout/weed/attr_cnv/{result_of => results}/negate.hpp (92%) rename sprout/weed/attr_cnv/{result_of => results}/shift_left.hpp (89%) rename sprout/weed/attr_cnv/{result_of => results}/times.hpp (92%) diff --git a/libs/array/test/array.cpp b/libs/array/test/array.cpp index 7728712a..f837143f 100644 --- a/libs/array/test/array.cpp +++ b/libs/array/test/array.cpp @@ -168,8 +168,8 @@ namespace testspr { TESTSPR_BOTH_ASSERT((std::is_same::type, int const>::value)); // is_array - TESTSPR_BOTH_ASSERT(sprout::is_array::value); - TESTSPR_BOTH_ASSERT(!sprout::is_array::value); + TESTSPR_BOTH_ASSERT(sprout::is_array_class::value); + TESTSPR_BOTH_ASSERT(!sprout::is_array_class::value); // sprout::to_hash, sprout::hash TESTSPR_BOTH_ASSERT(sprout::to_hash(arr1) == sprout::hash()(arr1)); diff --git a/libs/tuple/test/tuple.cpp b/libs/tuple/test/tuple.cpp index 8a6b356d..c35d0f30 100644 --- a/libs/tuple/test/tuple.cpp +++ b/libs/tuple/test/tuple.cpp @@ -207,7 +207,7 @@ namespace testspr { // tuple_cat { - typedef sprout::tuples::result_of::tuple_cat::type concatenated_type; + typedef sprout::tuples::results::tuple_cat::type concatenated_type; TESTSPR_BOTH_ASSERT(sprout::tuples::tuple_size::value == 4); TESTSPR_BOTH_ASSERT((std::is_same::type, int>::value)); TESTSPR_BOTH_ASSERT((std::is_same::type, double>::value)); diff --git a/sprout/algorithm/fit/bogo_sort.hpp b/sprout/algorithm/fit/bogo_sort.hpp index 256405e7..994576b1 100644 --- a/sprout/algorithm/fit/bogo_sort.hpp +++ b/sprout/algorithm/fit/bogo_sort.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bogo_sort_impl( Container const& cont, UniformRandomNumberGenerator&& g, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // bogo_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bogo_sort(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { return sprout::fit::detail::bogo_sort_impl( cont, sprout::forward(g), comp, @@ -47,7 +47,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bogo_sort_impl( Container const& cont, UniformRandomNumberGenerator&& g, typename sprout::container_traits::difference_type offset @@ -64,7 +64,7 @@ namespace sprout { // bogo_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bogo_sort(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fit::detail::bogo_sort_impl( cont, sprout::forward(g), diff --git a/sprout/algorithm/fit/bogo_sort_result.hpp b/sprout/algorithm/fit/bogo_sort_result.hpp index f326ecea..ca63efad 100644 --- a/sprout/algorithm/fit/bogo_sort_result.hpp +++ b/sprout/algorithm/fit/bogo_sort_result.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -24,7 +24,7 @@ namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bogo_sort_result_impl_1( @@ -33,7 +33,7 @@ namespace sprout { ) { typedef sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > result_type; return result_type( @@ -47,7 +47,7 @@ namespace sprout { } template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bogo_sort_result_impl( @@ -66,7 +66,7 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bogo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { return sprout::fit::detail::bogo_sort_result_impl( @@ -78,7 +78,7 @@ namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bogo_sort_result_impl( @@ -97,7 +97,7 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bogo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g) { diff --git a/sprout/algorithm/fit/bozo_sort.hpp b/sprout/algorithm/fit/bozo_sort.hpp index 54fc6a13..f5a8945e 100644 --- a/sprout/algorithm/fit/bozo_sort.hpp +++ b/sprout/algorithm/fit/bozo_sort.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bozo_sort_impl( Container const& cont, UniformRandomNumberGenerator&& g, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // bozo_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bozo_sort(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { return sprout::fit::detail::bozo_sort_impl( cont, sprout::forward(g), comp, @@ -47,7 +47,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bozo_sort_impl( Container const& cont, UniformRandomNumberGenerator&& g, typename sprout::container_traits::difference_type offset @@ -64,7 +64,7 @@ namespace sprout { // bozo_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bozo_sort(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fit::detail::bozo_sort_impl( cont, sprout::forward(g), diff --git a/sprout/algorithm/fit/bozo_sort_result.hpp b/sprout/algorithm/fit/bozo_sort_result.hpp index af1b458a..2e4d2db1 100644 --- a/sprout/algorithm/fit/bozo_sort_result.hpp +++ b/sprout/algorithm/fit/bozo_sort_result.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -24,7 +24,7 @@ namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bozo_sort_result_impl_1( @@ -33,7 +33,7 @@ namespace sprout { ) { typedef sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > result_type; return result_type( @@ -47,7 +47,7 @@ namespace sprout { } template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bozo_sort_result_impl( @@ -66,7 +66,7 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bozo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { @@ -79,7 +79,7 @@ namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bozo_sort_result_impl( @@ -98,7 +98,7 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > bozo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g) { diff --git a/sprout/algorithm/fit/clamp_range.hpp b/sprout/algorithm/fit/clamp_range.hpp index 1937ea6a..4463b6cf 100644 --- a/sprout/algorithm/fit/clamp_range.hpp +++ b/sprout/algorithm/fit/clamp_range.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_impl( Container const& cont, typename sprout::container_traits::value_type const& low, @@ -40,7 +40,7 @@ namespace sprout { // clamp_range // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range( Container const& cont, typename sprout::container_traits::value_type const& low, @@ -53,7 +53,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_impl( Container const& cont, typename sprout::container_traits::value_type const& low, @@ -72,7 +72,7 @@ namespace sprout { // clamp_range // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range( Container const& cont, typename sprout::container_traits::value_type const& low, diff --git a/sprout/algorithm/fit/clamp_range_copy.hpp b/sprout/algorithm/fit/clamp_range_copy.hpp index c79b6ba5..eca29da0 100644 --- a/sprout/algorithm/fit/clamp_range_copy.hpp +++ b/sprout/algorithm/fit/clamp_range_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_copy_impl( InputIterator first, InputIterator last, Result const& result, typename std::iterator_traits::value_type const& low, @@ -42,7 +42,7 @@ namespace sprout { // clamp_range_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_copy( InputIterator first, InputIterator last, Result const& result, typename std::iterator_traits::value_type const& low, @@ -56,7 +56,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_copy_impl( InputIterator first, InputIterator last, Result const& result, typename std::iterator_traits::value_type const& low, @@ -75,7 +75,7 @@ namespace sprout { // clamp_range_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_copy( InputIterator first, InputIterator last, Result const& result, typename std::iterator_traits::value_type const& low, diff --git a/sprout/algorithm/fit/copy.hpp b/sprout/algorithm/fit/copy.hpp index 173abc4c..4c1dd393 100644 --- a/sprout/algorithm/fit/copy.hpp +++ b/sprout/algorithm/fit/copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -39,7 +39,7 @@ namespace sprout { // copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::copy_impl(first, last, result, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/copy_backward.hpp b/sprout/algorithm/fit/copy_backward.hpp index 13d85e13..62ab76d0 100644 --- a/sprout/algorithm/fit/copy_backward.hpp +++ b/sprout/algorithm/fit/copy_backward.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_backward_impl( BidirectionalIterator first, BidirectionalIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // copy_backward // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_backward(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { return sprout::fit::detail::copy_backward_impl(first, last, result, sprout::internal_end_offset(result)); } diff --git a/sprout/algorithm/fit/copy_if.hpp b/sprout/algorithm/fit/copy_if.hpp index 96775b2c..913127bc 100644 --- a/sprout/algorithm/fit/copy_if.hpp +++ b/sprout/algorithm/fit/copy_if.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_if_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, typename sprout::container_traits::difference_type offset @@ -39,7 +39,7 @@ namespace sprout { // copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::copy_if_impl(first, last, result, pred, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/copy_n.hpp b/sprout/algorithm/fit/copy_n.hpp index 10536473..98e1e592 100644 --- a/sprout/algorithm/fit/copy_n.hpp +++ b/sprout/algorithm/fit/copy_n.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_n_impl( InputIterator first, Size n, Result const& result, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // copy_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_n(InputIterator first, Size n, Result const& result) { return sprout::fit::detail::copy_n_impl(first, n, result, sprout::internal_begin_offset(result)); } diff --git a/sprout/algorithm/fit/copy_until.hpp b/sprout/algorithm/fit/copy_until.hpp index 602b97e7..21fb8115 100644 --- a/sprout/algorithm/fit/copy_until.hpp +++ b/sprout/algorithm/fit/copy_until.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_until_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, typename sprout::container_traits::difference_type offset @@ -40,7 +40,7 @@ namespace sprout { // copy_until // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_until(InputIterator first, InputIterator last, Result const& result, Predicate pred) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::copy_until_impl(first, last, result, pred, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/copy_while.hpp b/sprout/algorithm/fit/copy_while.hpp index 2af20ae4..517a1300 100644 --- a/sprout/algorithm/fit/copy_while.hpp +++ b/sprout/algorithm/fit/copy_while.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_while_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, typename sprout::container_traits::difference_type offset @@ -40,7 +40,7 @@ namespace sprout { // copy_while // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_while(InputIterator first, InputIterator last, Result const& result, Predicate pred) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::copy_while_impl(first, last, result, pred, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/fill.hpp b/sprout/algorithm/fit/fill.hpp index 09fd33fb..706040a2 100644 --- a/sprout/algorithm/fit/fill.hpp +++ b/sprout/algorithm/fit/fill.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type fill_impl( Container const& cont, T const& value, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // fill // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type fill(Container const& cont, T const& value) { return sprout::fit::detail::fill_impl(cont, value, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/fill_n.hpp b/sprout/algorithm/fit/fill_n.hpp index b06dd1c3..3d407acd 100644 --- a/sprout/algorithm/fit/fill_n.hpp +++ b/sprout/algorithm/fit/fill_n.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include HDR_ALGORITHM_MIN_MAX_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type fill_n_impl( Container const& cont, Size n, T const& value, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // fill_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type fill_n(Container const& cont, Size n, T const& value) { return sprout::fit::detail::fill_n_impl(cont, n, value, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/generate.hpp b/sprout/algorithm/fit/generate.hpp index 76330159..b961bf2d 100644 --- a/sprout/algorithm/fit/generate.hpp +++ b/sprout/algorithm/fit/generate.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type generate_impl( Container const& cont, Generator const& gen, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // generate // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type generate(Container const& cont, Generator const& gen) { return sprout::fit::detail::generate_impl(cont, gen, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/generate_n.hpp b/sprout/algorithm/fit/generate_n.hpp index e3f6ec94..c8707fcf 100644 --- a/sprout/algorithm/fit/generate_n.hpp +++ b/sprout/algorithm/fit/generate_n.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include HDR_ALGORITHM_MIN_MAX_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type generate_n_impl( Container const& cont, Size n, Generator const& gen, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // generate_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type generate_n(Container const& cont, Size n, Generator const& gen) { return sprout::fit::detail::generate_n_impl(cont, n, gen, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/inplace_merge.hpp b/sprout/algorithm/fit/inplace_merge.hpp index 1796d0a8..de2b4a9b 100644 --- a/sprout/algorithm/fit/inplace_merge.hpp +++ b/sprout/algorithm/fit/inplace_merge.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type inplace_merge_impl( Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,14 +37,14 @@ namespace sprout { // inplace_merge // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type inplace_merge(Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp) { return sprout::fit::detail::inplace_merge_impl(cont, middle, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type inplace_merge_impl( Container const& cont, typename sprout::container_traits::const_iterator middle, typename sprout::container_traits::difference_type offset @@ -61,7 +61,7 @@ namespace sprout { // inplace_merge // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type inplace_merge(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fit::detail::inplace_merge_impl(cont, middle, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/make_heap.hpp b/sprout/algorithm/fit/make_heap.hpp index 82ef226c..39c945b9 100644 --- a/sprout/algorithm/fit/make_heap.hpp +++ b/sprout/algorithm/fit/make_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,14 +37,14 @@ namespace sprout { // make_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_heap(Container const& cont, Compare comp) { return sprout::fit::detail::make_heap_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_heap_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -61,7 +61,7 @@ namespace sprout { // make_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_heap(Container const& cont) { return sprout::fit::detail::make_heap_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/make_partial_heap.hpp b/sprout/algorithm/fit/make_partial_heap.hpp index f35f3a0e..2fb13155 100644 --- a/sprout/algorithm/fit/make_partial_heap.hpp +++ b/sprout/algorithm/fit/make_partial_heap.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_partial_heap_impl( Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp, typename sprout::container_traits::difference_type offset @@ -38,14 +38,14 @@ namespace sprout { // make_partial_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_partial_heap(Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp) { return sprout::fit::detail::make_partial_heap_impl(cont, middle, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_partial_heap_impl( Container const& cont, typename sprout::container_traits::const_iterator middle, typename sprout::container_traits::difference_type offset @@ -62,7 +62,7 @@ namespace sprout { // make_partial_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type make_partial_heap(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fit::detail::make_partial_heap_impl(cont, middle, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/merge.hpp b/sprout/algorithm/fit/merge.hpp index ae4193d6..5da83c8c 100644 --- a/sprout/algorithm/fit/merge.hpp +++ b/sprout/algorithm/fit/merge.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type merge_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -41,7 +41,7 @@ namespace sprout { // merge // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type merge( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -57,7 +57,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type merge_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -76,7 +76,7 @@ namespace sprout { // merge // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type merge( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, diff --git a/sprout/algorithm/fit/next_permutation.hpp b/sprout/algorithm/fit/next_permutation.hpp index ad590f47..2410f9fc 100644 --- a/sprout/algorithm/fit/next_permutation.hpp +++ b/sprout/algorithm/fit/next_permutation.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,14 +21,14 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> next_permutation_impl_1( Container const& cont, Permutation const& perm, typename sprout::container_traits::difference_type offset ) { - return sprout::pair::type, bool>( + return sprout::pair::type, bool>( sprout::sub_copy( sprout::get_internal(perm.first), offset, @@ -39,7 +39,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> next_permutation_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -52,14 +52,14 @@ namespace sprout { // next_permutation // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> next_permutation(Container const& cont, Compare comp) { return sprout::fit::detail::next_permutation_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> next_permutation_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -72,7 +72,7 @@ namespace sprout { // next_permutation // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> next_permutation(Container const& cont) { return sprout::fit::detail::next_permutation_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/nth_element.hpp b/sprout/algorithm/fit/nth_element.hpp index f7bc15c7..d160416c 100644 --- a/sprout/algorithm/fit/nth_element.hpp +++ b/sprout/algorithm/fit/nth_element.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type nth_element_impl( Container const& cont, typename sprout::container_traits::const_iterator nth, Compare comp, typename sprout::container_traits::difference_type offset @@ -38,14 +38,14 @@ namespace sprout { // nth_element // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type nth_element(Container const& cont, typename sprout::container_traits::const_iterator nth, Compare comp) { return sprout::fit::detail::nth_element_impl(cont, nth, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type nth_element_impl( Container const& cont, typename sprout::container_traits::const_iterator nth, typename sprout::container_traits::difference_type offset @@ -62,7 +62,7 @@ namespace sprout { // nth_element // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type nth_element(Container const& cont, typename sprout::container_traits::const_iterator nth) { return sprout::fit::detail::nth_element_impl(cont, nth, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/partial_sort.hpp b/sprout/algorithm/fit/partial_sort.hpp index a6a46e7a..fe026543 100644 --- a/sprout/algorithm/fit/partial_sort.hpp +++ b/sprout/algorithm/fit/partial_sort.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sort_impl( Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp, typename sprout::container_traits::difference_type offset @@ -38,14 +38,14 @@ namespace sprout { // partial_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sort(Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp) { return sprout::fit::detail::partial_sort_impl(cont, middle, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sort_impl( Container const& cont, typename sprout::container_traits::const_iterator middle, typename sprout::container_traits::difference_type offset @@ -62,7 +62,7 @@ namespace sprout { // partial_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sort(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fit::detail::partial_sort_impl(cont, middle, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/partition.hpp b/sprout/algorithm/fit/partition.hpp index 605c0a89..c56ee73a 100644 --- a/sprout/algorithm/fit/partition.hpp +++ b/sprout/algorithm/fit/partition.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partition_impl( Container const& cont, Predicate pred, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // partition // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partition(Container const& cont, Predicate pred) { return sprout::fit::detail::partition_impl(cont, pred, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/partition_copy.hpp b/sprout/algorithm/fit/partition_copy.hpp index 01c7b3b7..80f0157e 100644 --- a/sprout/algorithm/fit/partition_copy.hpp +++ b/sprout/algorithm/fit/partition_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -24,7 +24,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partition_copy_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, typename sprout::container_traits::difference_type offset @@ -43,7 +43,7 @@ namespace sprout { // partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partition_copy(InputIterator first, InputIterator last, Result const& result, Predicate pred) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::partition_copy_impl(first, last, result, pred, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/pop_heap.hpp b/sprout/algorithm/fit/pop_heap.hpp index e8766008..dde7b9b3 100644 --- a/sprout/algorithm/fit/pop_heap.hpp +++ b/sprout/algorithm/fit/pop_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type pop_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,14 +37,14 @@ namespace sprout { // pop_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type pop_heap(Container const& cont, Compare comp) { return sprout::fit::detail::pop_heap_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type pop_heap_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -61,7 +61,7 @@ namespace sprout { // pop_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type pop_heap(Container const& cont) { return sprout::fit::detail::pop_heap_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/prev_permutation.hpp b/sprout/algorithm/fit/prev_permutation.hpp index 91ed3109..e91e5dce 100644 --- a/sprout/algorithm/fit/prev_permutation.hpp +++ b/sprout/algorithm/fit/prev_permutation.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,13 +21,13 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> prev_permutation_impl_1( Container const& cont, Permutation const& perm, typename sprout::container_traits::difference_type offset ) { - return sprout::pair::type, bool>( + return sprout::pair::type, bool>( sprout::sub_copy( sprout::get_internal(perm.first), offset, @@ -38,7 +38,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> prev_permutation_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -51,14 +51,14 @@ namespace sprout { // prev_permutation // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> prev_permutation(Container const& cont, Compare comp) { return sprout::fit::detail::prev_permutation_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> prev_permutation_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -71,7 +71,7 @@ namespace sprout { // prev_permutation // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> prev_permutation(Container const& cont) { return sprout::fit::detail::prev_permutation_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/push_heap.hpp b/sprout/algorithm/fit/push_heap.hpp index 41f8cf3a..fa8630b3 100644 --- a/sprout/algorithm/fit/push_heap.hpp +++ b/sprout/algorithm/fit/push_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type push_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,14 +37,14 @@ namespace sprout { // push_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type push_heap(Container const& cont, Compare comp) { return sprout::fit::detail::push_heap_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type push_heap_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -61,7 +61,7 @@ namespace sprout { // push_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type push_heap(Container const& cont) { return sprout::fit::detail::push_heap_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/random_swap.hpp b/sprout/algorithm/fit/random_swap.hpp index 7101ff56..ec7af182 100644 --- a/sprout/algorithm/fit/random_swap.hpp +++ b/sprout/algorithm/fit/random_swap.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type random_swap_impl( Container const& cont, UniformRandomNumberGenerator&& g, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // random_swap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type random_swap(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fit::detail::random_swap_impl( cont, sprout::forward(g), diff --git a/sprout/algorithm/fit/random_swap_result.hpp b/sprout/algorithm/fit/random_swap_result.hpp index 14641090..405f9b34 100644 --- a/sprout/algorithm/fit/random_swap_result.hpp +++ b/sprout/algorithm/fit/random_swap_result.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -24,7 +24,7 @@ namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > random_swap_result_impl_1( @@ -33,7 +33,7 @@ namespace sprout { ) { typedef sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > result_type; return result_type( @@ -47,7 +47,7 @@ namespace sprout { } template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > random_swap_result_impl( @@ -66,7 +66,7 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > random_swap_result(Container const& cont, UniformRandomNumberGenerator&& g) { diff --git a/sprout/algorithm/fit/recurrence.hpp b/sprout/algorithm/fit/recurrence.hpp index ac2b5e76..24f224f7 100644 --- a/sprout/algorithm/fit/recurrence.hpp +++ b/sprout/algorithm/fit/recurrence.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type recurrence_impl( Container const& cont, Generator const& gen, typename sprout::container_traits::difference_type offset, @@ -38,7 +38,7 @@ namespace sprout { // recurrence // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type recurrence(Container const& cont, Generator const& gen, Inits const&... inits) { return sprout::fit::detail::recurrence_impl(cont, gen, sprout::internal_begin_offset(cont), inits...); } diff --git a/sprout/algorithm/fit/recurrence_n.hpp b/sprout/algorithm/fit/recurrence_n.hpp index 4784080f..03db7e13 100644 --- a/sprout/algorithm/fit/recurrence_n.hpp +++ b/sprout/algorithm/fit/recurrence_n.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include HDR_ALGORITHM_MIN_MAX_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type recurrence_n_impl( Container const& cont, Size n, Generator const& gen, typename sprout::container_traits::difference_type offset, @@ -39,7 +39,7 @@ namespace sprout { // recurrence_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type recurrence_n(Container const& cont, Size n, Generator const& gen, Inits const&... inits) { return sprout::fit::detail::recurrence_n_impl(cont, n, gen, sprout::internal_begin_offset(cont), inits...); } diff --git a/sprout/algorithm/fit/remove.hpp b/sprout/algorithm/fit/remove.hpp index 93cb5eb7..3224cf60 100644 --- a/sprout/algorithm/fit/remove.hpp +++ b/sprout/algorithm/fit/remove.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_impl( Container const& cont, T const& value, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // remove // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove(Container const& cont, T const& value) { return sprout::fit::detail::remove_impl(cont, value, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/remove_copy.hpp b/sprout/algorithm/fit/remove_copy.hpp index 16779b2b..13355990 100644 --- a/sprout/algorithm/fit/remove_copy.hpp +++ b/sprout/algorithm/fit/remove_copy.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_copy_impl( InputIterator first, InputIterator last, Result const& result, T const& value, typename sprout::container_traits::difference_type offset @@ -40,7 +40,7 @@ namespace sprout { // remove_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_copy(InputIterator first, InputIterator last, Result const& result, T const& value) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::remove_copy_impl(first, last, result, value, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/remove_copy_if.hpp b/sprout/algorithm/fit/remove_copy_if.hpp index 75eb9229..625be09b 100644 --- a/sprout/algorithm/fit/remove_copy_if.hpp +++ b/sprout/algorithm/fit/remove_copy_if.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_copy_if_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, typename sprout::container_traits::difference_type offset @@ -40,7 +40,7 @@ namespace sprout { // remove_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::remove_copy_if_impl(first, last, result, pred, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/remove_if.hpp b/sprout/algorithm/fit/remove_if.hpp index 0b972475..fb0736ba 100644 --- a/sprout/algorithm/fit/remove_if.hpp +++ b/sprout/algorithm/fit/remove_if.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_if_impl( Container const& cont, Predicate pred, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // remove_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_if(Container const& cont, Predicate pred) { return sprout::fit::detail::remove_if_impl(cont, pred, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/replace.hpp b/sprout/algorithm/fit/replace.hpp index ac00cf87..f3e47cce 100644 --- a/sprout/algorithm/fit/replace.hpp +++ b/sprout/algorithm/fit/replace.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_impl( Container const& cont, T const& old_value, T const& new_value, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // replace // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace(Container const& cont, T const& old_value, T const& new_value) { return sprout::fit::detail::replace_impl(cont, old_value, new_value, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/replace_copy.hpp b/sprout/algorithm/fit/replace_copy.hpp index 565f0a28..21691c94 100644 --- a/sprout/algorithm/fit/replace_copy.hpp +++ b/sprout/algorithm/fit/replace_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_copy_impl( InputIterator first, InputIterator last, Result const& result, T const& old_value, T const& new_value, typename sprout::container_traits::difference_type offset @@ -39,7 +39,7 @@ namespace sprout { // replace_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_copy(InputIterator first, InputIterator last, Result const& result, T const& old_value, T const& new_value) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::replace_copy_impl( diff --git a/sprout/algorithm/fit/replace_copy_if.hpp b/sprout/algorithm/fit/replace_copy_if.hpp index 2589a351..fd48f1b8 100644 --- a/sprout/algorithm/fit/replace_copy_if.hpp +++ b/sprout/algorithm/fit/replace_copy_if.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_copy_if_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, T const& new_value, typename sprout::container_traits::difference_type offset @@ -39,7 +39,7 @@ namespace sprout { // replace_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred, T const& new_value) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::replace_copy_if_impl(first, last, result, pred, new_value, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/replace_if.hpp b/sprout/algorithm/fit/replace_if.hpp index bd4314ef..5b03a6f7 100644 --- a/sprout/algorithm/fit/replace_if.hpp +++ b/sprout/algorithm/fit/replace_if.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_if_impl( Container const& cont, Predicate pred, T const& new_value, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // replace_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_if(Container const& cont, Predicate pred, T const& new_value) { return sprout::fit::detail::replace_if_impl(cont, pred, new_value, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/result_of.hpp b/sprout/algorithm/fit/results.hpp similarity index 83% rename from sprout/algorithm/fit/result_of.hpp rename to sprout/algorithm/fit/results.hpp index 7ce7ac4c..69244ba4 100644 --- a/sprout/algorithm/fit/result_of.hpp +++ b/sprout/algorithm/fit/results.hpp @@ -12,12 +12,12 @@ #include #include #include -#include +#include #include namespace sprout { namespace fit { - namespace result_of { + namespace results { // // algorithm // @@ -27,12 +27,12 @@ namespace sprout { typedef sprout::sub_array< typename std::decay< typename sprout::containers::internal< - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type >::type > type; }; - } // namespace result_of + } // namespace results } // namespace fit } // namespace sprout diff --git a/sprout/algorithm/fit/reverse.hpp b/sprout/algorithm/fit/reverse.hpp index 40d10c32..3c62a321 100644 --- a/sprout/algorithm/fit/reverse.hpp +++ b/sprout/algorithm/fit/reverse.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type reverse_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // reverse // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type reverse(Container const& cont) { return sprout::fit::detail::reverse_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/reverse_copy.hpp b/sprout/algorithm/fit/reverse_copy.hpp index 91e189ef..a038aada 100644 --- a/sprout/algorithm/fit/reverse_copy.hpp +++ b/sprout/algorithm/fit/reverse_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type reverse_copy_impl( BidirectionalIterator first, BidirectionalIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // reverse_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type reverse_copy(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { return sprout::fit::detail::reverse_copy_impl(first, last, result, sprout::internal_begin_offset(result)); } diff --git a/sprout/algorithm/fit/rotate.hpp b/sprout/algorithm/fit/rotate.hpp index 88adfc19..47eea891 100644 --- a/sprout/algorithm/fit/rotate.hpp +++ b/sprout/algorithm/fit/rotate.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type rotate_impl( Container const& cont, typename sprout::container_traits::const_iterator middle, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // rotate // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type rotate(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fit::detail::rotate_impl(cont, middle, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/rotate_copy.hpp b/sprout/algorithm/fit/rotate_copy.hpp index 06738332..6b29c7eb 100644 --- a/sprout/algorithm/fit/rotate_copy.hpp +++ b/sprout/algorithm/fit/rotate_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type rotate_copy_impl( ForwardIterator first, ForwardIterator middle, ForwardIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // rotate_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last, Result const& result) { return sprout::fit::detail::rotate_copy_impl(first, middle, last, result, sprout::internal_begin_offset(result)); } diff --git a/sprout/algorithm/fit/set_difference.hpp b/sprout/algorithm/fit/set_difference.hpp index a5ff29c5..7f438ebd 100644 --- a/sprout/algorithm/fit/set_difference.hpp +++ b/sprout/algorithm/fit/set_difference.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_difference_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -44,7 +44,7 @@ namespace sprout { // set_difference // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -60,7 +60,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_difference_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -81,7 +81,7 @@ namespace sprout { // set_difference // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, diff --git a/sprout/algorithm/fit/set_intersection.hpp b/sprout/algorithm/fit/set_intersection.hpp index 799f4d73..a520fec6 100644 --- a/sprout/algorithm/fit/set_intersection.hpp +++ b/sprout/algorithm/fit/set_intersection.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_intersection_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -43,7 +43,7 @@ namespace sprout { // set_intersection // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_intersection( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -59,7 +59,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_intersection_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -80,7 +80,7 @@ namespace sprout { // set_intersection // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_intersection( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, diff --git a/sprout/algorithm/fit/set_symmetric_difference.hpp b/sprout/algorithm/fit/set_symmetric_difference.hpp index 9c3336ad..7313e348 100644 --- a/sprout/algorithm/fit/set_symmetric_difference.hpp +++ b/sprout/algorithm/fit/set_symmetric_difference.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_symmetric_difference_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -44,7 +44,7 @@ namespace sprout { // set_symmetric_difference // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -60,7 +60,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_symmetric_difference_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -81,7 +81,7 @@ namespace sprout { // set_symmetric_difference // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, diff --git a/sprout/algorithm/fit/set_union.hpp b/sprout/algorithm/fit/set_union.hpp index c7f1b664..57dad8b7 100644 --- a/sprout/algorithm/fit/set_union.hpp +++ b/sprout/algorithm/fit/set_union.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_union_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -44,7 +44,7 @@ namespace sprout { // set_union // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_union( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -60,7 +60,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_union_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -81,7 +81,7 @@ namespace sprout { // set_union // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type set_union( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, diff --git a/sprout/algorithm/fit/shuffle.hpp b/sprout/algorithm/fit/shuffle.hpp index bc55e5cd..893e1ec7 100644 --- a/sprout/algorithm/fit/shuffle.hpp +++ b/sprout/algorithm/fit/shuffle.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type shuffle_impl( Container const& cont, UniformRandomNumberGenerator&& g, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // shuffle // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type shuffle(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fit::detail::shuffle_impl( cont, sprout::forward(g), diff --git a/sprout/algorithm/fit/shuffle_result.hpp b/sprout/algorithm/fit/shuffle_result.hpp index fd206219..82c6712d 100644 --- a/sprout/algorithm/fit/shuffle_result.hpp +++ b/sprout/algorithm/fit/shuffle_result.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -24,7 +24,7 @@ namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > shuffle_result_impl_1( @@ -33,7 +33,7 @@ namespace sprout { ) { typedef sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > result_type; return result_type( @@ -47,7 +47,7 @@ namespace sprout { } template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > shuffle_result_impl( @@ -66,7 +66,7 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::tuples::tuple< - typename sprout::fit::result_of::algorithm::type, + typename sprout::fit::results::algorithm::type, typename std::decay::type > shuffle_result(Container const& cont, UniformRandomNumberGenerator&& g) { diff --git a/sprout/algorithm/fit/sort.hpp b/sprout/algorithm/fit/sort.hpp index f959ae7e..6517a646 100644 --- a/sprout/algorithm/fit/sort.hpp +++ b/sprout/algorithm/fit/sort.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,14 +37,14 @@ namespace sprout { // sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort(Container const& cont, Compare comp) { return sprout::fit::detail::sort_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -61,7 +61,7 @@ namespace sprout { // sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort(Container const& cont) { return sprout::fit::detail::sort_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/sort_heap.hpp b/sprout/algorithm/fit/sort_heap.hpp index 33267533..9231dafb 100644 --- a/sprout/algorithm/fit/sort_heap.hpp +++ b/sprout/algorithm/fit/sort_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,14 +37,14 @@ namespace sprout { // sort_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort_heap(Container const& cont, Compare comp) { return sprout::fit::detail::sort_heap_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort_heap_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -61,7 +61,7 @@ namespace sprout { // sort_heap // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sort_heap(Container const& cont) { return sprout::fit::detail::sort_heap_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/stable_partition.hpp b/sprout/algorithm/fit/stable_partition.hpp index 60a46674..d67cab87 100644 --- a/sprout/algorithm/fit/stable_partition.hpp +++ b/sprout/algorithm/fit/stable_partition.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_partition_impl( Container const& cont, Predicate pred, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // stable_partition // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_partition(Container const& cont, Predicate pred) { return sprout::fit::detail::stable_partition_impl(cont, pred, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/stable_partition_copy.hpp b/sprout/algorithm/fit/stable_partition_copy.hpp index cd78cfe0..6f9ce078 100644 --- a/sprout/algorithm/fit/stable_partition_copy.hpp +++ b/sprout/algorithm/fit/stable_partition_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_partition_copy_impl( BidirectionalIterator first, BidirectionalIterator last, Result const& result, Predicate pred, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // stable_partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_partition_copy(BidirectionalIterator first, BidirectionalIterator last, Result const& result, Predicate pred) { return sprout::fit::detail::stable_partition_copy_impl(first, last, result, pred, sprout::internal_begin_offset(result)); } diff --git a/sprout/algorithm/fit/stable_sort.hpp b/sprout/algorithm/fit/stable_sort.hpp index 8491a871..ff788cdb 100644 --- a/sprout/algorithm/fit/stable_sort.hpp +++ b/sprout/algorithm/fit/stable_sort.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_sort_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset @@ -37,14 +37,14 @@ namespace sprout { // stable_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_sort(Container const& cont, Compare comp) { return sprout::fit::detail::stable_sort_impl(cont, comp, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_sort_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -61,7 +61,7 @@ namespace sprout { // stable_sort // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_sort(Container const& cont) { return sprout::fit::detail::stable_sort_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/swap_element.hpp b/sprout/algorithm/fit/swap_element.hpp index 9bb85e60..8668e01d 100644 --- a/sprout/algorithm/fit/swap_element.hpp +++ b/sprout/algorithm/fit/swap_element.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type swap_element_impl( Container const& cont, typename sprout::container_traits::const_iterator pos1, @@ -40,7 +40,7 @@ namespace sprout { // swap_element // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type swap_element( Container const& cont, typename sprout::container_traits::const_iterator pos1, diff --git a/sprout/algorithm/fit/swap_element_copy.hpp b/sprout/algorithm/fit/swap_element_copy.hpp index 526f9dba..bfb2bb7c 100644 --- a/sprout/algorithm/fit/swap_element_copy.hpp +++ b/sprout/algorithm/fit/swap_element_copy.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type swap_element_copy_impl( ForwardIterator first, ForwardIterator last, Result const& result, ForwardIterator pos1, ForwardIterator pos2, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // swap_element_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type swap_element_copy(ForwardIterator first, ForwardIterator last, Result const& result, ForwardIterator pos1, ForwardIterator pos2) { return sprout::fit::detail::swap_element_copy_impl(first, last, result, pos1, pos2, sprout::internal_begin_offset(result)); } diff --git a/sprout/algorithm/fit/transform.hpp b/sprout/algorithm/fit/transform.hpp index d8e7453a..cebc294c 100644 --- a/sprout/algorithm/fit/transform.hpp +++ b/sprout/algorithm/fit/transform.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type transform_impl( InputIterator first, InputIterator last, Result const& result, UnaryOperation op, typename sprout::container_traits::difference_type offset @@ -39,7 +39,7 @@ namespace sprout { // transform // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type transform(InputIterator first, InputIterator last, Result const& result, UnaryOperation op) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::transform_impl(first, last, result, op, sprout::internal_begin_offset(result)); @@ -47,7 +47,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type transform_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Result const& result, BinaryOperation op, typename sprout::container_traits::difference_type offset @@ -64,7 +64,7 @@ namespace sprout { // transform // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Result const& result, BinaryOperation op) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::transform_impl(first1, last1, first2, result, op, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fit/unfold.hpp b/sprout/algorithm/fit/unfold.hpp index 6754c81c..56a69acd 100644 --- a/sprout/algorithm/fit/unfold.hpp +++ b/sprout/algorithm/fit/unfold.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unfold_impl( Container const& cont, Generator const& gen, Init const& init, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // unfold // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unfold(Container const& cont, Generator const& gen, Init const& init) { return sprout::fit::detail::unfold_impl(cont, gen, init, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/unfold_n.hpp b/sprout/algorithm/fit/unfold_n.hpp index 9b668ad7..33abe670 100644 --- a/sprout/algorithm/fit/unfold_n.hpp +++ b/sprout/algorithm/fit/unfold_n.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include HDR_ALGORITHM_MIN_MAX_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unfold_n_impl( Container const& cont, Size n, Generator const& gen, Init const& init, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // unfold_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unfold_n(Container const& cont, Size n, Generator const& gen, Init const& init) { return sprout::fit::detail::unfold_n_impl(cont, n, gen, init, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/unique.hpp b/sprout/algorithm/fit/unique.hpp index 936e7b0f..d062b30c 100644 --- a/sprout/algorithm/fit/unique.hpp +++ b/sprout/algorithm/fit/unique.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -38,14 +38,14 @@ namespace sprout { // unique // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique(Container const& cont) { return sprout::fit::detail::unique_impl(cont, sprout::internal_begin_offset(cont)); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_impl( Container const& cont, BinaryPredicate pred, typename sprout::container_traits::difference_type offset @@ -62,7 +62,7 @@ namespace sprout { // unique // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique(Container const& cont, BinaryPredicate pred) { return sprout::fit::detail::unique_impl(cont, pred, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/fit/unique_copy.hpp b/sprout/algorithm/fit/unique_copy.hpp index 8314003a..a08bc434 100644 --- a/sprout/algorithm/fit/unique_copy.hpp +++ b/sprout/algorithm/fit/unique_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_copy_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -40,7 +40,7 @@ namespace sprout { // unique_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_copy(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::unique_copy_impl(first, last, result, sprout::internal_begin_offset(result)); @@ -48,7 +48,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_copy_impl( InputIterator first, InputIterator last, Result const& result, BinaryPredicate pred, typename sprout::container_traits::difference_type offset @@ -65,7 +65,7 @@ namespace sprout { // unique_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_copy(InputIterator first, InputIterator last, Result const& result, BinaryPredicate pred) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::unique_copy_impl(first, last, result, pred, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/fixed/bogo_sort.hpp b/sprout/algorithm/fixed/bogo_sort.hpp index ed95ed45..9f34e479 100644 --- a/sprout/algorithm/fixed/bogo_sort.hpp +++ b/sprout/algorithm/fixed/bogo_sort.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,14 +21,14 @@ namespace sprout { // bogo_sort // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type bogo_sort(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { return sprout::first( sprout::fixed::bogo_sort_result(cont, sprout::forward(g), comp) ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type bogo_sort(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::first( sprout::fixed::bogo_sort_result(cont, sprout::forward(g)) diff --git a/sprout/algorithm/fixed/bogo_sort_result.hpp b/sprout/algorithm/fixed/bogo_sort_result.hpp index 34940e60..c47191d3 100644 --- a/sprout/algorithm/fixed/bogo_sort_result.hpp +++ b/sprout/algorithm/fixed/bogo_sort_result.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -63,9 +63,9 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type bogo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { - typedef typename sprout::fixed::result_of::shuffle::type result_type; + typedef typename sprout::fixed::results::shuffle::type result_type; typedef sprout::pair type; return sprout::is_sorted(sprout::begin(cont), sprout::end(cont), comp) ? result_type(sprout::deep_copy(cont), sprout::forward(g)) @@ -80,7 +80,7 @@ namespace sprout { // bogo_sort_result // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type bogo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { return sprout::fixed::detail::bogo_sort_result( cont, @@ -89,7 +89,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type bogo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fixed::detail::bogo_sort_result( cont, diff --git a/sprout/algorithm/fixed/bozo_sort.hpp b/sprout/algorithm/fixed/bozo_sort.hpp index d023b717..c88847b8 100644 --- a/sprout/algorithm/fixed/bozo_sort.hpp +++ b/sprout/algorithm/fixed/bozo_sort.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,14 +21,14 @@ namespace sprout { // bozo_sort // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type bozo_sort(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { return sprout::first( sprout::fixed::bozo_sort_result(cont, sprout::forward(g), comp) ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type bozo_sort(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::first( sprout::fixed::bozo_sort_result(cont, sprout::forward(g)) diff --git a/sprout/algorithm/fixed/bozo_sort_result.hpp b/sprout/algorithm/fixed/bozo_sort_result.hpp index 1b9fa86c..b2d1f912 100644 --- a/sprout/algorithm/fixed/bozo_sort_result.hpp +++ b/sprout/algorithm/fixed/bozo_sort_result.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -63,9 +63,9 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type bozo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { - typedef typename sprout::fixed::result_of::shuffle::type result_type; + typedef typename sprout::fixed::results::shuffle::type result_type; typedef sprout::pair type; return sprout::is_sorted(sprout::begin(cont), sprout::end(cont), comp) ? result_type(sprout::deep_copy(cont), sprout::forward(g)) @@ -80,7 +80,7 @@ namespace sprout { // bozo_sort_result // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type bozo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g, Compare comp) { return sprout::fixed::detail::bozo_sort_result( cont, @@ -89,7 +89,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type bozo_sort_result(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fixed::detail::bozo_sort_result( cont, diff --git a/sprout/algorithm/fixed/clamp_range.hpp b/sprout/algorithm/fixed/clamp_range.hpp index e44ea997..a5ef46fe 100644 --- a/sprout/algorithm/fixed/clamp_range.hpp +++ b/sprout/algorithm/fixed/clamp_range.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // clamp_range // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range( Container const& cont, typename sprout::container_traits::value_type const& low, @@ -31,7 +31,7 @@ namespace sprout { return sprout::fixed::clamp_range_copy(sprout::begin(cont), sprout::end(cont), cont, low, high, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range( Container const& cont, typename sprout::container_traits::value_type const& low, diff --git a/sprout/algorithm/fixed/clamp_range_copy.hpp b/sprout/algorithm/fixed/clamp_range_copy.hpp index 19b019da..d4198552 100644 --- a/sprout/algorithm/fixed/clamp_range_copy.hpp +++ b/sprout/algorithm/fixed/clamp_range_copy.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, typename std::iterator_traits::value_type const& low, @@ -49,7 +49,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( RandomAccessIterator first, RandomAccessIterator last, Result const& result, typename std::iterator_traits::value_type const& low, @@ -70,7 +70,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type clamp_range_copy_impl( InputIterator, InputIterator, Result const& result, @@ -86,7 +86,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type clamp_range_copy_impl( InputIterator first, InputIterator last, Result const& result, @@ -107,7 +107,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputIterator first, InputIterator last, Result const& result, typename std::iterator_traits::value_type const& low, @@ -122,7 +122,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type clamp_range_copy( InputIterator first, InputIterator last, Result const& result, @@ -138,7 +138,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type clamp_range_copy( InputIterator first, InputIterator last, Result const& result, @@ -158,7 +158,7 @@ namespace sprout { // clamp_range_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputIterator first, InputIterator last, Result const& result, typename std::iterator_traits::value_type const& low, @@ -169,7 +169,7 @@ namespace sprout { return sprout::fixed::detail::clamp_range_copy(first, last, result, low, high, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputIterator first, InputIterator last, Result const& result, typename std::iterator_traits::value_type const& low, @@ -183,7 +183,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputIterator first, InputIterator last, typename std::iterator_traits::value_type const& low, @@ -194,7 +194,7 @@ namespace sprout { return sprout::fixed::clamp_range_copy(first, last, sprout::pit(), low, high, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputIterator first, InputIterator last, typename std::iterator_traits::value_type const& low, diff --git a/sprout/algorithm/fixed/copy.hpp b/sprout/algorithm/fixed/copy.hpp index bccee3a0..9405e114 100644 --- a/sprout/algorithm/fixed/copy.hpp +++ b/sprout/algorithm/fixed/copy.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, sprout::index_tuple, @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy( RandomAccessIterator first, RandomAccessIterator last, Result const& result, std::random_access_iterator_tag* @@ -63,7 +63,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_impl( InputIterator, InputIterator, Result const& result, @@ -76,7 +76,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_impl( InputIterator first, InputIterator last, Result const& result, @@ -90,7 +90,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy( InputIterator first, InputIterator last, Result const& result, std::input_iterator_tag* @@ -102,7 +102,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy(InputIterator first, InputIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -112,7 +112,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy(InputIterator first, InputIterator last, Result const& result) { return sprout::remake( @@ -125,13 +125,13 @@ namespace sprout { // copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::detail::copy(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy(InputIterator first, InputIterator last) { return sprout::fixed::copy(first, last, sprout::pit()); } @@ -141,13 +141,13 @@ namespace sprout { typename InputIterator, typename Result, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::copy(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy(InputIterator first, InputIterator last) { return sprout::fixed::copy(first, last); } diff --git a/sprout/algorithm/fixed/copy_backward.hpp b/sprout/algorithm/fixed/copy_backward.hpp index 7d507255..9100eab8 100644 --- a/sprout/algorithm/fixed/copy_backward.hpp +++ b/sprout/algorithm/fixed/copy_backward.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward_impl_ra( RandomAccessIterator, RandomAccessIterator last, Result const& result, sprout::index_tuple, @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward( RandomAccessIterator first, RandomAccessIterator last, Result const& result, std::random_access_iterator_tag* @@ -62,7 +62,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_backward_impl( BidirectionalIterator, BidirectionalIterator, Result const& result, @@ -75,7 +75,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_backward_impl( BidirectionalIterator first, BidirectionalIterator last, Result const& result, @@ -89,7 +89,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward( BidirectionalIterator first, BidirectionalIterator last, Result const& result, std::bidirectional_iterator_tag* @@ -104,7 +104,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_backward(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -115,13 +115,13 @@ namespace sprout { // copy_backward // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { return sprout::fixed::detail::copy_backward(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward(BidirectionalIterator first, BidirectionalIterator last) { return sprout::fixed::copy_backward(first, last, sprout::pit()); } @@ -131,13 +131,13 @@ namespace sprout { typename BidirectionalIterator, typename Result, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { return sprout::fixed::copy_backward(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward(BidirectionalIterator first, BidirectionalIterator last) { return sprout::fixed::copy_backward(first, last); } diff --git a/sprout/algorithm/fixed/copy_if.hpp b/sprout/algorithm/fixed/copy_if.hpp index 2a7c430e..52b06d62 100644 --- a/sprout/algorithm/fixed/copy_if.hpp +++ b/sprout/algorithm/fixed/copy_if.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -26,7 +26,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_if_impl(InputIterator, InputIterator, Result const& result, Predicate, typename sprout::container_traits::size_type, @@ -38,7 +38,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_if_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, @@ -57,7 +57,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::copy_if_impl(first, last, result, pred, sprout::size(result)); @@ -66,7 +66,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::remake( @@ -80,13 +80,13 @@ namespace sprout { // copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::copy_if(first, last, result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_if(InputIterator first, InputIterator last, Predicate pred) { return sprout::fixed::copy_if(first, last, sprout::pit(), pred); } @@ -96,13 +96,13 @@ namespace sprout { typename InputIterator, typename Result, typename Predicate, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::copy_if(first, last, result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_if(InputIterator first, InputIterator last, Predicate pred) { return sprout::fixed::copy_if(first, last, pred); } diff --git a/sprout/algorithm/fixed/copy_n.hpp b/sprout/algorithm/fixed/copy_n.hpp index da962ab1..28c9ea20 100644 --- a/sprout/algorithm/fixed/copy_n.hpp +++ b/sprout/algorithm/fixed/copy_n.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_n( RandomAccessIterator first, Size n, Result const& result, std::random_access_iterator_tag* @@ -39,7 +39,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_n_impl(InputIterator, Size, Result const& result, typename sprout::container_traits::difference_type, @@ -51,7 +51,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_n_impl( InputIterator first, Size n, Result const& result, @@ -65,7 +65,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_n( InputIterator first, Size n, Result const& result, std::input_iterator_tag* @@ -77,7 +77,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_n(InputIterator first, Size n, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -87,7 +87,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_n(InputIterator first, Size n, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); @@ -98,13 +98,13 @@ namespace sprout { // copy_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_n(InputIterator first, Size n, Result const& result) { return sprout::fixed::detail::copy_n(first, n, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_n(InputIterator first, Size n) { return sprout::fixed::copy_n(first, n, sprout::pit()); } @@ -114,13 +114,13 @@ namespace sprout { typename InputIterator, typename Size, typename Result, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_n(InputIterator first, Size n, Result const& result) { return sprout::fixed::copy_n(first, n, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_n(InputIterator first, Size n) { return sprout::fixed::copy_n(first, n); } diff --git a/sprout/algorithm/fixed/copy_until.hpp b/sprout/algorithm/fixed/copy_until.hpp index 1cc1362f..337a787a 100644 --- a/sprout/algorithm/fixed/copy_until.hpp +++ b/sprout/algorithm/fixed/copy_until.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -26,7 +26,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_until( RandomAccessIterator first, RandomAccessIterator last, Result const& result, Predicate pred, std::random_access_iterator_tag* @@ -38,7 +38,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_until_impl( InputIterator, InputIterator, Result const& result, Predicate, @@ -51,7 +51,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_until_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, @@ -65,7 +65,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_until( InputIterator first, InputIterator last, Result const& result, Predicate pred, std::input_iterator_tag* @@ -77,7 +77,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_until(InputIterator first, InputIterator last, Result const& result, Predicate pred) { typedef typename std::iterator_traits::iterator_category* category; @@ -87,7 +87,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_until(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::remake( @@ -101,13 +101,13 @@ namespace sprout { // copy_until // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_until(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::copy_until(first, last, result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_until(InputIterator first, InputIterator last, Predicate pred) { return sprout::fixed::copy_until(first, last, sprout::pit(), pred); } diff --git a/sprout/algorithm/fixed/copy_while.hpp b/sprout/algorithm/fixed/copy_while.hpp index 27f911ce..6f795049 100644 --- a/sprout/algorithm/fixed/copy_while.hpp +++ b/sprout/algorithm/fixed/copy_while.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -25,7 +25,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_while( RandomAccessIterator first, RandomAccessIterator last, Result const& result, Predicate pred, std::random_access_iterator_tag* @@ -37,7 +37,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_while_impl( InputIterator, InputIterator, Result const& result, Predicate, @@ -50,7 +50,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_while_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, @@ -64,7 +64,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_while( InputIterator first, InputIterator last, Result const& result, Predicate pred, std::input_iterator_tag* @@ -76,7 +76,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_while(InputIterator first, InputIterator last, Result const& result, Predicate pred) { typedef typename std::iterator_traits::iterator_category* category; @@ -86,7 +86,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type copy_while(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::remake( @@ -100,13 +100,13 @@ namespace sprout { // copy_while // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_while(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::copy_while(first, last, result, pred); } template< typename Result, typename InputIterator,typename Predicate> - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_while(InputIterator first, InputIterator last, Predicate pred) { return sprout::fixed::copy_while(first, last, sprout::pit(), pred); } diff --git a/sprout/algorithm/fixed/deprecated/sort.hpp b/sprout/algorithm/fixed/deprecated/sort.hpp index 134e0ae0..5c40359f 100644 --- a/sprout/algorithm/fixed/deprecated/sort.hpp +++ b/sprout/algorithm/fixed/deprecated/sort.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_lr( Container const& cont, typename sprout::container_traits::difference_type start, @@ -32,7 +32,7 @@ namespace sprout { typename sprout::container_traits::value_type const& p ); template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_start( Container const& cont, typename sprout::container_traits::difference_type start, @@ -79,7 +79,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_part_l( Container const& cont, typename sprout::container_traits::difference_type start, @@ -93,7 +93,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_part_r( Container const& cont, typename sprout::container_traits::difference_type end, @@ -107,7 +107,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_part_lr( Container const& cont, typename sprout::container_traits::difference_type start, @@ -125,7 +125,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_next( Container const& cont, typename sprout::container_traits::difference_type start, @@ -154,7 +154,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_lr( Container const& cont, typename sprout::container_traits::difference_type start, @@ -176,7 +176,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_start( Container const& cont, typename sprout::container_traits::difference_type start, @@ -197,7 +197,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size <= 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type sort(Container const& cont, Compare comp) { return sprout::deep_copy(cont); @@ -205,7 +205,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size > 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type sort(Container const& cont, Compare comp) { return sprout::fixed::detail::sort_start( @@ -218,7 +218,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size <= 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type sort(Container const& cont) { return sprout::deep_copy(cont); @@ -226,7 +226,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size > 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type sort(Container const& cont) { return sprout::fixed::detail::sort_start( @@ -242,12 +242,12 @@ namespace sprout { // sort // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort(Container const& cont, Compare comp) { return sprout::fixed::detail::sort(cont, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort(Container const& cont) { return sprout::fixed::detail::sort(cont); } diff --git a/sprout/algorithm/fixed/fill.hpp b/sprout/algorithm/fixed/fill.hpp index 56b53567..2a8ff340 100644 --- a/sprout/algorithm/fixed/fill.hpp +++ b/sprout/algorithm/fixed/fill.hpp @@ -14,14 +14,14 @@ #include #include #include -#include +#include #include namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type fill_impl( Container const& cont, T const& value, sprout::index_tuple, @@ -41,7 +41,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type fill(Container const& cont, T const& value) { return sprout::fixed::detail::fill_impl( @@ -55,7 +55,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type fill(Container const& cont, T const& value) { return sprout::remake( @@ -69,13 +69,13 @@ namespace sprout { // fill // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type fill(Container const& cont, T const& value) { return sprout::fixed::detail::fill(cont, value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type fill(T const& value) { return sprout::fixed::fill(sprout::pit(), value); } diff --git a/sprout/algorithm/fixed/fill_n.hpp b/sprout/algorithm/fixed/fill_n.hpp index 9e97c319..2376b840 100644 --- a/sprout/algorithm/fixed/fill_n.hpp +++ b/sprout/algorithm/fixed/fill_n.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -26,7 +26,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type fill_n(Container const& cont, Size n, T const& value) { return sprout::fixed::detail::fill_impl( @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type fill_n(Container const& cont, Size n, T const& value) { return sprout::remake( @@ -54,13 +54,13 @@ namespace sprout { // fill_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type fill_n(Container const& cont, Size n, T const& value) { return sprout::fixed::detail::fill_n(cont, n, value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type fill_n(Size n, T const& value) { return sprout::fixed::fill_n(sprout::pit(), n, value); } @@ -70,13 +70,13 @@ namespace sprout { typename Container, typename Size, typename T, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type fill_n(Container const& cont, Size n, T const& value) { return sprout::fixed::fill_n(cont, n, value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type fill_n(Size n, T const& value) { return sprout::fixed::fill_n(n, value); } diff --git a/sprout/algorithm/fixed/generate.hpp b/sprout/algorithm/fixed/generate.hpp index a36da992..7be625a5 100644 --- a/sprout/algorithm/fixed/generate.hpp +++ b/sprout/algorithm/fixed/generate.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type generate_impl_1( Container const& cont, Next const& next, @@ -36,7 +36,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type generate_impl_1( Container const& cont, Next const& next, @@ -55,7 +55,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type generate_impl( Container const& cont, Generator const&, @@ -67,7 +67,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type generate_impl( Container const& cont, Generator const& gen, @@ -84,13 +84,13 @@ namespace sprout { // generate // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate(Container const& cont, Generator const& gen) { return sprout::fixed::detail::generate_impl(cont, gen, sprout::size(cont)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate(Generator const& gen) { return sprout::fixed::generate(sprout::pit(), gen); } diff --git a/sprout/algorithm/fixed/generate_n.hpp b/sprout/algorithm/fixed/generate_n.hpp index b350861b..7cd97a52 100644 --- a/sprout/algorithm/fixed/generate_n.hpp +++ b/sprout/algorithm/fixed/generate_n.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include @@ -20,13 +20,13 @@ namespace sprout { // generate_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate_n(Container const& cont, Size n, Generator const& gen) { return sprout::fixed::detail::generate_impl(cont, gen, n); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate_n(Size n, Generator const& gen) { return sprout::fixed::generate_n(sprout::pit(), n, gen); } @@ -36,13 +36,13 @@ namespace sprout { typename Container, typename Size, typename Generator, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate_n(Container const& cont, Size n, Generator const& gen) { return sprout::fixed::generate_n(cont, n, gen); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate_n(Size n, Generator const& gen) { return sprout::fixed::generate_n(n, gen); } diff --git a/sprout/algorithm/fixed/inplace_merge.hpp b/sprout/algorithm/fixed/inplace_merge.hpp index efa07613..669d86c8 100644 --- a/sprout/algorithm/fixed/inplace_merge.hpp +++ b/sprout/algorithm/fixed/inplace_merge.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // inplace_merge // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type inplace_merge(Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp) { return sprout::fixed::merge( sprout::begin(cont), middle, @@ -32,7 +32,7 @@ namespace sprout { // inplace_merge // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type inplace_merge(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fixed::merge( sprout::begin(cont), middle, diff --git a/sprout/algorithm/fixed/make_heap.hpp b/sprout/algorithm/fixed/make_heap.hpp index a1eedc43..915ee16b 100644 --- a/sprout/algorithm/fixed/make_heap.hpp +++ b/sprout/algorithm/fixed/make_heap.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT #ifdef SPROUT_WORKAROUND_NOT_TERMINATE_RECURSIVE_CONSTEXPR_FUNCTION_TEMPLATE # include @@ -24,7 +24,7 @@ namespace sprout { namespace detail { #ifdef SPROUT_WORKAROUND_NOT_TERMINATE_RECURSIVE_CONSTEXPR_FUNCTION_TEMPLATE template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -34,7 +34,7 @@ namespace sprout { typename sprout::container_traits::difference_type r = 2 ); template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -44,7 +44,7 @@ namespace sprout { typename sprout::container_traits::difference_type r = 2 ); template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl_1( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -80,7 +80,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl_1( Container const&, Compare, typename sprout::container_traits::difference_type, @@ -93,7 +93,7 @@ namespace sprout { return sprout::throw_recursive_function_template_instantiation_exeeded(); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -126,7 +126,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl( Container const&, Compare, typename sprout::container_traits::difference_type, @@ -140,7 +140,7 @@ namespace sprout { } #else template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -150,7 +150,7 @@ namespace sprout { typename sprout::container_traits::difference_type r = 2 ); template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl_1( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -186,7 +186,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -224,7 +224,7 @@ namespace sprout { // make_heap // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap(Container const& cont, Compare comp) { return sprout::fixed::detail::make_heap_impl( cont, comp, @@ -233,7 +233,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_heap(Container const& cont) { return sprout::fixed::detail::make_heap_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), diff --git a/sprout/algorithm/fixed/make_partial_heap.hpp b/sprout/algorithm/fixed/make_partial_heap.hpp index 0fff7d61..6b4158fa 100644 --- a/sprout/algorithm/fixed/make_partial_heap.hpp +++ b/sprout/algorithm/fixed/make_partial_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_partial_heap_impl_1( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -51,7 +51,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_partial_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -69,7 +69,7 @@ namespace sprout { // make_partial_heap // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_partial_heap(Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp) { return sprout::fixed::detail::make_partial_heap_impl( cont, comp, @@ -82,7 +82,7 @@ namespace sprout { // make_partial_heap // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type make_partial_heap(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fixed::detail::make_partial_heap_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), diff --git a/sprout/algorithm/fixed/merge.hpp b/sprout/algorithm/fixed/merge.hpp index e4162eb7..892f4eff 100644 --- a/sprout/algorithm/fixed/merge.hpp +++ b/sprout/algorithm/fixed/merge.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -25,7 +25,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type merge_impl( InputIterator1, InputIterator1, @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type merge_impl( InputIterator1 first1, InputIterator1 last1, @@ -79,7 +79,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type merge( InputIterator1 first1, InputIterator1 last1, @@ -98,7 +98,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type merge( InputIterator1 first1, InputIterator1 last1, @@ -117,7 +117,7 @@ namespace sprout { // merge // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -127,7 +127,7 @@ namespace sprout { return sprout::fixed::detail::merge(first1, last1, first2, last2, result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -138,7 +138,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -148,7 +148,7 @@ namespace sprout { return sprout::fixed::merge(first1, last1, first2, last2, sprout::pit(), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2 diff --git a/sprout/algorithm/fixed/next_permutation.hpp b/sprout/algorithm/fixed/next_permutation.hpp index cd2ac0ac..50c28e2b 100644 --- a/sprout/algorithm/fixed/next_permutation.hpp +++ b/sprout/algorithm/fixed/next_permutation.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -92,18 +92,18 @@ namespace sprout { // next_permutation // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> next_permutation(Container const& cont, Compare comp) { - typedef sprout::pair::type, bool> type; + typedef sprout::pair::type, bool> type; return sprout::fixed::detail::next_permutation_impl( cont, comp, sprout::begin(cont), sprout::end(cont) ); } template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> next_permutation(Container const& cont) { - typedef sprout::pair::type, bool> type; + typedef sprout::pair::type, bool> type; return sprout::fixed::detail::next_permutation_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), sprout::begin(cont), sprout::end(cont) diff --git a/sprout/algorithm/fixed/nth_element.hpp b/sprout/algorithm/fixed/nth_element.hpp index c24a4cde..f4c63761 100644 --- a/sprout/algorithm/fixed/nth_element.hpp +++ b/sprout/algorithm/fixed/nth_element.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type nth_element_impl_1( Container const& cont, typename sprout::container_traits::difference_type offset, @@ -35,7 +35,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type nth_element_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -54,7 +54,7 @@ namespace sprout { // nth_element // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type nth_element(Container const& cont, typename sprout::container_traits::const_iterator nth, Compare comp) { return sprout::fixed::detail::nth_element_impl( cont, comp, @@ -64,7 +64,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type nth_element(Container const& cont, typename sprout::container_traits::const_iterator nth) { return sprout::fixed::detail::nth_element_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), diff --git a/sprout/algorithm/fixed/partial_sort.hpp b/sprout/algorithm/fixed/partial_sort.hpp index 39760bb9..d91d3acc 100644 --- a/sprout/algorithm/fixed/partial_sort.hpp +++ b/sprout/algorithm/fixed/partial_sort.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sort_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -39,7 +39,7 @@ namespace sprout { // partial_sort // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sort(Container const& cont, typename sprout::container_traits::const_iterator middle, Compare comp) { return sprout::fixed::detail::partial_sort_impl( cont, comp, @@ -49,7 +49,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sort(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fixed::detail::partial_sort_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), diff --git a/sprout/algorithm/fixed/partition.hpp b/sprout/algorithm/fixed/partition.hpp index 8c9c3e32..a67a04ea 100644 --- a/sprout/algorithm/fixed/partition.hpp +++ b/sprout/algorithm/fixed/partition.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // partition // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partition(Container const& cont, Predicate pred) { return sprout::fixed::partition_copy(sprout::begin(cont), sprout::end(cont), cont, pred); } diff --git a/sprout/algorithm/fixed/partition_copy.hpp b/sprout/algorithm/fixed/partition_copy.hpp index 842f7be2..46cc1fa7 100644 --- a/sprout/algorithm/fixed/partition_copy.hpp +++ b/sprout/algorithm/fixed/partition_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partition_copy_impl( InputIterator, InputIterator, Result const& result, Predicate, @@ -36,7 +36,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partition_copy_impl( InputIterator first, InputIterator last, Result const& result, Predicate pred, @@ -56,13 +56,13 @@ namespace sprout { // partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partition_copy(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::partition_copy_impl(first, last, result, pred, sprout::size(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partition_copy(InputIterator first, InputIterator last, Predicate pred) { return sprout::fixed::partition_copy(first, last, sprout::pit(), pred); } diff --git a/sprout/algorithm/fixed/pop_heap.hpp b/sprout/algorithm/fixed/pop_heap.hpp index a5eb579f..d1fbe60e 100644 --- a/sprout/algorithm/fixed/pop_heap.hpp +++ b/sprout/algorithm/fixed/pop_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -20,7 +20,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type pop_heap_impl( Container const& cont, Compare comp, @@ -72,7 +72,7 @@ namespace sprout { // pop_heap // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type pop_heap(Container const& cont, Compare comp) { return sprout::fixed::detail::pop_heap_impl( sprout::fixed::swap_element(cont, sprout::begin(cont), sprout::end(cont) - 1), @@ -82,7 +82,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type pop_heap(Container const& cont) { return sprout::fixed::detail::pop_heap_impl( sprout::fixed::swap_element(cont, sprout::begin(cont), sprout::end(cont) - 1), diff --git a/sprout/algorithm/fixed/prev_permutation.hpp b/sprout/algorithm/fixed/prev_permutation.hpp index 3d357c6f..c5da031c 100644 --- a/sprout/algorithm/fixed/prev_permutation.hpp +++ b/sprout/algorithm/fixed/prev_permutation.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -92,9 +92,9 @@ namespace sprout { // prev_permutation // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> prev_permutation(Container const& cont, Compare comp) { - typedef sprout::pair::type, bool> type; + typedef sprout::pair::type, bool> type; return sprout::fixed::detail::prev_permutation_impl( cont, comp, sprout::begin(cont), sprout::end(cont) @@ -104,9 +104,9 @@ namespace sprout { // prev_permutation // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> prev_permutation(Container const& cont) { - typedef sprout::pair::type, bool> type; + typedef sprout::pair::type, bool> type; return sprout::fixed::detail::prev_permutation_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), sprout::begin(cont), sprout::end(cont) diff --git a/sprout/algorithm/fixed/push_heap.hpp b/sprout/algorithm/fixed/push_heap.hpp index 1aa118f1..ad551f95 100644 --- a/sprout/algorithm/fixed/push_heap.hpp +++ b/sprout/algorithm/fixed/push_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -20,7 +20,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type push_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -50,7 +50,7 @@ namespace sprout { // push_heap // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type push_heap(Container const& cont, Compare comp) { return sprout::fixed::detail::push_heap_impl( cont, comp, @@ -59,7 +59,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type push_heap(Container const& cont) { return sprout::fixed::detail::push_heap_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), diff --git a/sprout/algorithm/fixed/random_swap.hpp b/sprout/algorithm/fixed/random_swap.hpp index 7c85aa26..077b8096 100644 --- a/sprout/algorithm/fixed/random_swap.hpp +++ b/sprout/algorithm/fixed/random_swap.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -49,7 +49,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type random_swap_impl_1(Container const& cont, RandomSwapped const& random_swapped) { return random_swapped[0] == random_swapped[1] ? sprout::deep_copy(cont) @@ -61,7 +61,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type random_swap_impl( Container const& cont, UniformRandomNumberGenerator&& g, typename sprout::container_traits::size_type size @@ -80,7 +80,7 @@ namespace sprout { // random_swap // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type random_swap(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fixed::detail::random_swap_impl( cont, sprout::forward(g), diff --git a/sprout/algorithm/fixed/random_swap_result.hpp b/sprout/algorithm/fixed/random_swap_result.hpp index 91831963..93eb7e29 100644 --- a/sprout/algorithm/fixed/random_swap_result.hpp +++ b/sprout/algorithm/fixed/random_swap_result.hpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include @@ -61,9 +61,9 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type random_swap_result_impl_1(Container const& cont, RandomSwapped const& random_swapped) { - typedef typename sprout::fixed::result_of::shuffle::type result_type; + typedef typename sprout::fixed::results::shuffle::type result_type; return sprout::first(random_swapped)[0] == sprout::first(random_swapped)[1] ? result_type(sprout::deep_copy(cont), sprout::second(random_swapped)) : result_type( @@ -77,7 +77,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type random_swap_result_impl( Container const& cont, UniformRandomNumberGenerator&& g, typename sprout::container_traits::size_type size @@ -96,7 +96,7 @@ namespace sprout { // random_swap_result // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type random_swap_result(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fixed::detail::random_swap_result_impl( cont, sprout::forward(g), diff --git a/sprout/algorithm/fixed/recurrence.hpp b/sprout/algorithm/fixed/recurrence.hpp index 374c01f9..f637403b 100644 --- a/sprout/algorithm/fixed/recurrence.hpp +++ b/sprout/algorithm/fixed/recurrence.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -46,7 +46,7 @@ namespace sprout { return call_gen(gen, args...); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type recurrence_impl_drop( Container const& cont, Generator const&, typename sprout::container_traits::size_type @@ -57,7 +57,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size >= sizeof...(Inits) + 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type recurrence_impl_drop( Container const& cont, Generator const& gen, @@ -73,7 +73,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size < sizeof...(Inits) + 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type recurrence_impl_drop( Container const& cont, Generator const& gen, @@ -86,7 +86,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type recurrence_impl_1( Container const& cont, Generator const&, @@ -99,7 +99,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type recurrence_impl_1( Container const& cont, Generator const& gen, @@ -119,7 +119,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size > sizeof...(Inits)), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type recurrence_impl( Container const& cont, Generator const& gen, @@ -135,7 +135,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size <= sizeof...(Inits)), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type recurrence_impl( Container const& cont, Generator const& gen, @@ -150,13 +150,13 @@ namespace sprout { // recurrence // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type recurrence(Container const& cont, Generator const& gen, Inits const&... inits) { return sprout::fixed::detail::recurrence_impl(cont, gen, sprout::size(cont), inits...); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type recurrence(Generator const& gen, Inits const&... inits) { return sprout::fixed::recurrence(sprout::pit(), gen, inits...); } diff --git a/sprout/algorithm/fixed/recurrence_n.hpp b/sprout/algorithm/fixed/recurrence_n.hpp index 1390aad6..5c409f19 100644 --- a/sprout/algorithm/fixed/recurrence_n.hpp +++ b/sprout/algorithm/fixed/recurrence_n.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include @@ -20,13 +20,13 @@ namespace sprout { // recurrence_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type recurrence_n(Container const& cont, Size n, Generator const& gen, Inits const&... inits) { return sprout::fixed::detail::recurrence_impl(cont, gen, n, inits...); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type recurrence_n(Size n, Generator const& gen, Inits const&... inits) { return sprout::fixed::recurrence_n(sprout::pit(), n, gen, inits...); } diff --git a/sprout/algorithm/fixed/remove.hpp b/sprout/algorithm/fixed/remove.hpp index 7c834cde..e39eb917 100644 --- a/sprout/algorithm/fixed/remove.hpp +++ b/sprout/algorithm/fixed/remove.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -19,7 +19,7 @@ namespace sprout { // remove // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove(Container const& cont, T const& value) { return sprout::fixed::remove_copy(sprout::begin(cont), sprout::end(cont), cont, value); } diff --git a/sprout/algorithm/fixed/remove_copy.hpp b/sprout/algorithm/fixed/remove_copy.hpp index e06f1227..fd3e0cb3 100644 --- a/sprout/algorithm/fixed/remove_copy.hpp +++ b/sprout/algorithm/fixed/remove_copy.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -26,7 +26,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy_impl( InputIterator, InputIterator, @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy_impl( InputIterator first, InputIterator last, @@ -60,7 +60,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy(InputIterator first, InputIterator last, Result const& result, T const& value) { return sprout::fixed::detail::remove_copy_impl(first, last, result, value, sprout::size(result)); @@ -69,7 +69,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy(InputIterator first, InputIterator last, Result const& result, T const& value) { return sprout::remake( @@ -83,13 +83,13 @@ namespace sprout { // remove_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy(InputIterator first, InputIterator last, Result const& result, T const& value) { return sprout::fixed::detail::remove_copy(first, last, result, value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy(InputIterator first, InputIterator last, T const& value) { return sprout::fixed::remove_copy(first, last, sprout::pit(), value); } @@ -99,13 +99,13 @@ namespace sprout { typename InputIterator, typename Result, typename T, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy(InputIterator first, InputIterator last, Result const& result, T const& value) { return sprout::fixed::remove_copy(first, last, result, value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy(InputIterator first, InputIterator last, T const& value) { return sprout::fixed::remove_copy(first, last, value); } diff --git a/sprout/algorithm/fixed/remove_copy_if.hpp b/sprout/algorithm/fixed/remove_copy_if.hpp index 1dac7ddb..7c423920 100644 --- a/sprout/algorithm/fixed/remove_copy_if.hpp +++ b/sprout/algorithm/fixed/remove_copy_if.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -26,7 +26,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy_if_impl( InputIterator, InputIterator, @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy_if_impl( InputIterator first, InputIterator last, @@ -60,7 +60,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::remove_copy_if_impl(first, last, result, pred, sprout::size(result)); @@ -69,7 +69,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type remove_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::remake( @@ -83,13 +83,13 @@ namespace sprout { // remove_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::remove_copy_if(first, last, result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy_if(InputIterator first, InputIterator last, Predicate pred) { return sprout::fixed::remove_copy_if(first, last, sprout::pit(), pred); } @@ -99,13 +99,13 @@ namespace sprout { typename InputIterator, typename Result, typename Predicate, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred) { return sprout::fixed::remove_copy_if(first, last, result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy_if(InputIterator first, InputIterator last, Predicate pred) { return sprout::fixed::remove_copy_if(first, last, pred); } diff --git a/sprout/algorithm/fixed/remove_if.hpp b/sprout/algorithm/fixed/remove_if.hpp index 0d14fdc6..62b7a722 100644 --- a/sprout/algorithm/fixed/remove_if.hpp +++ b/sprout/algorithm/fixed/remove_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -19,7 +19,7 @@ namespace sprout { // remove_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_if(Container const& cont, Predicate pred) { return sprout::fixed::remove_copy_if(sprout::begin(cont), sprout::end(cont), cont, pred); } diff --git a/sprout/algorithm/fixed/replace.hpp b/sprout/algorithm/fixed/replace.hpp index 28e91d50..b220cdc2 100644 --- a/sprout/algorithm/fixed/replace.hpp +++ b/sprout/algorithm/fixed/replace.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -19,7 +19,7 @@ namespace sprout { // replace // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace(Container const& cont, T const& old_value, T const& new_value) { return sprout::fixed::replace_copy(sprout::begin(cont), sprout::end(cont), cont, old_value, new_value); } diff --git a/sprout/algorithm/fixed/replace_copy.hpp b/sprout/algorithm/fixed/replace_copy.hpp index e63ff626..4446bf82 100644 --- a/sprout/algorithm/fixed/replace_copy.hpp +++ b/sprout/algorithm/fixed/replace_copy.hpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -28,7 +28,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, T const& old_value, T const& new_value, @@ -47,7 +47,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy( RandomAccessIterator first, RandomAccessIterator last, Result const& result, T const& old_value, T const& new_value, @@ -66,7 +66,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy_impl( InputIterator, InputIterator, @@ -80,7 +80,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy_impl( InputIterator first, InputIterator last, @@ -99,7 +99,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy( InputIterator first, InputIterator last, Result const& result, T const& old_value, T const& new_value, @@ -112,7 +112,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy(InputIterator first, InputIterator last, Result const& result, T const& old_value, T const& new_value) { typedef typename std::iterator_traits::iterator_category* category; @@ -122,7 +122,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy(InputIterator first, InputIterator last, Result const& result, T const& old_value, T const& new_value) { return sprout::remake( @@ -136,13 +136,13 @@ namespace sprout { // replace_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy(InputIterator first, InputIterator last, Result const& result, T const& old_value, T const& new_value) { return sprout::fixed::detail::replace_copy(first, last, result, old_value, new_value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy(InputIterator first, InputIterator last, T const& old_value, T const& new_value) { return sprout::fixed::replace_copy(first, last, sprout::pit(), old_value, new_value); } @@ -152,13 +152,13 @@ namespace sprout { typename InputIterator, typename Result, typename T, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy(InputIterator first, InputIterator last, Result const& result, T const& old_value, T const& new_value) { return sprout::fixed::replace_copy(first, last, result, old_value, new_value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy(InputIterator first, InputIterator last, T const& old_value, T const& new_value) { return sprout::fixed::replace_copy(first, last, old_value, new_value); } diff --git a/sprout/algorithm/fixed/replace_copy_if.hpp b/sprout/algorithm/fixed/replace_copy_if.hpp index 57439e39..933dd2c3 100644 --- a/sprout/algorithm/fixed/replace_copy_if.hpp +++ b/sprout/algorithm/fixed/replace_copy_if.hpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, Predicate pred, T const& new_value, @@ -46,7 +46,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if( RandomAccessIterator first, RandomAccessIterator last, Result const& result, Predicate pred, T const& new_value, @@ -65,7 +65,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy_if_impl( InputIterator, InputIterator, @@ -79,7 +79,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy_if_impl( InputIterator first, InputIterator last, @@ -98,7 +98,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if( InputIterator first, InputIterator last, Result const& result, Predicate pred, T const& new_value, @@ -111,7 +111,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred, T const& new_value) { typedef typename std::iterator_traits::iterator_category* category; @@ -121,7 +121,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type replace_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred, T const& new_value) { return sprout::remake( @@ -135,13 +135,13 @@ namespace sprout { // replace_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred, T const& new_value) { return sprout::fixed::detail::replace_copy_if(first, last, result, pred, new_value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if(InputIterator first, InputIterator last, Predicate pred, T const& new_value) { return sprout::fixed::replace_copy_if(first, last, sprout::pit(), pred, new_value); } @@ -151,13 +151,13 @@ namespace sprout { typename InputIterator, typename Result, typename Predicate, typename T, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if(InputIterator first, InputIterator last, Result const& result, Predicate pred, T const& new_value) { return sprout::fixed::replace_copy_if(first, last, result, pred, new_value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if(InputIterator first, InputIterator last, Predicate pred, T const& new_value) { return sprout::fixed::replace_copy_if(first, last, pred, new_value); } diff --git a/sprout/algorithm/fixed/replace_if.hpp b/sprout/algorithm/fixed/replace_if.hpp index 7592ad0d..cbbcbca5 100644 --- a/sprout/algorithm/fixed/replace_if.hpp +++ b/sprout/algorithm/fixed/replace_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -19,7 +19,7 @@ namespace sprout { // replace_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_if(Container const& cont, Predicate pred, T const& new_value) { return sprout::fixed::replace_copy_if(sprout::begin(cont), sprout::end(cont), cont, pred, new_value); } diff --git a/sprout/algorithm/fixed/result_of.hpp b/sprout/algorithm/fixed/results.hpp similarity index 79% rename from sprout/algorithm/fixed/result_of.hpp rename to sprout/algorithm/fixed/results.hpp index 56a50364..8252731f 100644 --- a/sprout/algorithm/fixed/result_of.hpp +++ b/sprout/algorithm/fixed/results.hpp @@ -15,7 +15,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // algorithm // @@ -32,17 +32,17 @@ namespace sprout { struct shuffle { public: typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, + typename sprout::fixed::results::algorithm::type, typename std::decay::type > type; }; - } // namespace result_of + } // namespace results } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::algorithm; - using sprout::fixed::result_of::shuffle; - } // namespace result_of + namespace results { + using sprout::fixed::results::algorithm; + using sprout::fixed::results::shuffle; + } // namespace results } // namespace sprout #endif // #ifndef SPROUT_ALGORITHM_FIXED_RESULT_OF_HPP diff --git a/sprout/algorithm/fixed/reverse.hpp b/sprout/algorithm/fixed/reverse.hpp index 2820bc69..4774dd5a 100644 --- a/sprout/algorithm/fixed/reverse.hpp +++ b/sprout/algorithm/fixed/reverse.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -19,7 +19,7 @@ namespace sprout { // reverse // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse(Container const& cont) { return sprout::fixed::reverse_copy(sprout::begin(cont), sprout::end(cont), cont); } diff --git a/sprout/algorithm/fixed/reverse_copy.hpp b/sprout/algorithm/fixed/reverse_copy.hpp index eed0bf7a..4faf711a 100644 --- a/sprout/algorithm/fixed/reverse_copy.hpp +++ b/sprout/algorithm/fixed/reverse_copy.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include @@ -25,7 +25,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy_impl_ra( RandomAccessIterator, RandomAccessIterator last, Result const& result, sprout::index_tuple, @@ -44,7 +44,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy( RandomAccessIterator first, RandomAccessIterator last, Result const& result, std::random_access_iterator_tag* @@ -62,7 +62,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type reverse_copy_impl( BidirectionalIterator, BidirectionalIterator, Result const& result, @@ -75,7 +75,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type reverse_copy_impl( BidirectionalIterator first, BidirectionalIterator last, Result const& result, @@ -89,7 +89,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy( BidirectionalIterator first, BidirectionalIterator last, Result const& result, std::bidirectional_iterator_tag* @@ -101,7 +101,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type reverse_copy(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -111,7 +111,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type reverse_copy(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { return sprout::remake( @@ -125,13 +125,13 @@ namespace sprout { // reverse_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { return sprout::fixed::detail::reverse_copy(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy(BidirectionalIterator first, BidirectionalIterator last) { return sprout::fixed::reverse_copy(first, last, sprout::pit()); } @@ -141,13 +141,13 @@ namespace sprout { typename BidirectionalIterator, typename Result, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy(BidirectionalIterator first, BidirectionalIterator last, Result const& result) { return sprout::fixed::reverse_copy(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy(BidirectionalIterator first, BidirectionalIterator last) { return sprout::fixed::reverse_copy(first, last); } diff --git a/sprout/algorithm/fixed/rotate.hpp b/sprout/algorithm/fixed/rotate.hpp index d41e9dac..d651cb93 100644 --- a/sprout/algorithm/fixed/rotate.hpp +++ b/sprout/algorithm/fixed/rotate.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // rotate // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate(Container const& cont, typename sprout::container_traits::const_iterator middle) { return sprout::fixed::rotate_copy(sprout::begin(cont), middle, sprout::end(cont), cont); } diff --git a/sprout/algorithm/fixed/rotate_copy.hpp b/sprout/algorithm/fixed/rotate_copy.hpp index 877dc621..79621991 100644 --- a/sprout/algorithm/fixed/rotate_copy.hpp +++ b/sprout/algorithm/fixed/rotate_copy.hpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator middle, RandomAccessIterator last, Result const& result, @@ -50,7 +50,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy( RandomAccessIterator first, RandomAccessIterator middle, RandomAccessIterator last, Result const& result, @@ -70,7 +70,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type rotate_copy_impl_1( ForwardIterator, ForwardIterator, @@ -84,7 +84,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type rotate_copy_impl_1( ForwardIterator first, ForwardIterator last, @@ -101,7 +101,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type rotate_copy_impl( ForwardIterator, ForwardIterator, @@ -116,7 +116,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type rotate_copy_impl( ForwardIterator first, ForwardIterator middle, @@ -132,7 +132,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy( ForwardIterator first, ForwardIterator middle, ForwardIterator last, Result const& result, std::forward_iterator_tag* @@ -144,7 +144,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -154,7 +154,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last, Result const& result) { return sprout::remake( @@ -168,13 +168,13 @@ namespace sprout { // rotate_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last, Result const& result) { return sprout::fixed::detail::rotate_copy(first, middle, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last) { return sprout::fixed::rotate_copy(first, middle, last, sprout::pit()); } @@ -184,13 +184,13 @@ namespace sprout { typename ForwardIterator, typename Result, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last, Result const& result) { return sprout::fixed::rotate_copy(first, middle, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last) { return sprout::fixed::rotate_copy(first, middle, last); } diff --git a/sprout/algorithm/fixed/set_difference.hpp b/sprout/algorithm/fixed/set_difference.hpp index b64f22a9..c9c550fb 100644 --- a/sprout/algorithm/fixed/set_difference.hpp +++ b/sprout/algorithm/fixed/set_difference.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -25,7 +25,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_difference_impl( InputIterator1, InputIterator1, @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_difference_impl( InputIterator1 first1, InputIterator1 last1, @@ -79,7 +79,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_difference( InputIterator1 first1, InputIterator1 last1, @@ -98,7 +98,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_difference( InputIterator1 first1, InputIterator1 last1, @@ -117,7 +117,7 @@ namespace sprout { // set_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -127,7 +127,7 @@ namespace sprout { return sprout::fixed::detail::set_difference(first1, last1, first2, last2, result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -138,7 +138,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -148,7 +148,7 @@ namespace sprout { return sprout::fixed::set_difference(first1, last1, first2, last2, sprout::pit(), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2 diff --git a/sprout/algorithm/fixed/set_intersection.hpp b/sprout/algorithm/fixed/set_intersection.hpp index 4b94fb3e..1668200a 100644 --- a/sprout/algorithm/fixed/set_intersection.hpp +++ b/sprout/algorithm/fixed/set_intersection.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -25,7 +25,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_intersection_impl( InputIterator1, InputIterator1, @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_intersection_impl( InputIterator1 first1, InputIterator1 last1, @@ -76,7 +76,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_intersection( InputIterator1 first1, InputIterator1 last1, @@ -95,7 +95,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_intersection( InputIterator1 first1, InputIterator1 last1, @@ -114,7 +114,7 @@ namespace sprout { // set_intersection // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -124,7 +124,7 @@ namespace sprout { return sprout::fixed::detail::set_intersection(first1, last1, first2, last2, result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -135,7 +135,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -145,7 +145,7 @@ namespace sprout { return sprout::fixed::set_intersection(first1, last1, first2, last2, sprout::pit(), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2 diff --git a/sprout/algorithm/fixed/set_symmetric_difference.hpp b/sprout/algorithm/fixed/set_symmetric_difference.hpp index a98283d3..9d35f974 100644 --- a/sprout/algorithm/fixed/set_symmetric_difference.hpp +++ b/sprout/algorithm/fixed/set_symmetric_difference.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -25,7 +25,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_symmetric_difference_impl( InputIterator1, InputIterator1, @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_symmetric_difference_impl( InputIterator1 first1, InputIterator1 last1, @@ -84,7 +84,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, @@ -103,7 +103,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, @@ -122,7 +122,7 @@ namespace sprout { // set_symmetric_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -132,7 +132,7 @@ namespace sprout { return sprout::fixed::detail::set_symmetric_difference(first1, last1, first2, last2, result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -143,7 +143,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -153,7 +153,7 @@ namespace sprout { return sprout::fixed::set_symmetric_difference(first1, last1, first2, last2, sprout::pit(), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2 diff --git a/sprout/algorithm/fixed/set_union.hpp b/sprout/algorithm/fixed/set_union.hpp index 45cffeaf..027f0765 100644 --- a/sprout/algorithm/fixed/set_union.hpp +++ b/sprout/algorithm/fixed/set_union.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -25,7 +25,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_union_impl( InputIterator1, InputIterator1, @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_union_impl( InputIterator1 first1, InputIterator1 last1, @@ -84,7 +84,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_union( InputIterator1 first1, InputIterator1 last1, @@ -103,7 +103,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type set_union( InputIterator1 first1, InputIterator1 last1, @@ -122,7 +122,7 @@ namespace sprout { // set_union // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -132,7 +132,7 @@ namespace sprout { return sprout::fixed::detail::set_union(first1, last1, first2, last2, result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -143,7 +143,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, @@ -153,7 +153,7 @@ namespace sprout { return sprout::fixed::set_union(first1, last1, first2, last2, sprout::pit(), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2 diff --git a/sprout/algorithm/fixed/shuffle.hpp b/sprout/algorithm/fixed/shuffle.hpp index fc0e6757..00a64006 100644 --- a/sprout/algorithm/fixed/shuffle.hpp +++ b/sprout/algorithm/fixed/shuffle.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,7 +55,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type shuffle_impl_1( Container const& cont, sprout::index_tuple, @@ -74,7 +74,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type shuffle_impl( Container const& cont, sprout::index_tuple indexes, @@ -99,7 +99,7 @@ namespace sprout { // shuffle // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type shuffle(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fixed::detail::shuffle_impl( cont, diff --git a/sprout/algorithm/fixed/shuffle_result.hpp b/sprout/algorithm/fixed/shuffle_result.hpp index 3ec82090..3dcdbc18 100644 --- a/sprout/algorithm/fixed/shuffle_result.hpp +++ b/sprout/algorithm/fixed/shuffle_result.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,7 +66,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type shuffle_result_impl_1( Container const& cont, sprout::index_tuple, @@ -75,7 +75,7 @@ namespace sprout { typename sprout::container_traits::size_type size ) { - typedef typename sprout::fixed::result_of::shuffle::type result_type; + typedef typename sprout::fixed::results::shuffle::type result_type; return result_type( sprout::remake( cont, @@ -89,7 +89,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type shuffle_result_impl( Container const& cont, sprout::index_tuple indexes, @@ -114,7 +114,7 @@ namespace sprout { // shuffle_result // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::shuffle::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::shuffle::type shuffle_result(Container const& cont, UniformRandomNumberGenerator&& g) { return sprout::fixed::detail::shuffle_result_impl( cont, diff --git a/sprout/algorithm/fixed/sort.hpp b/sprout/algorithm/fixed/sort.hpp index 0fd5debc..3b17b3be 100644 --- a/sprout/algorithm/fixed/sort.hpp +++ b/sprout/algorithm/fixed/sort.hpp @@ -9,7 +9,7 @@ #define SPROUT_ALGORITHM_FIXED_SORT_HPP #include -#include +#include #include namespace sprout { @@ -18,12 +18,12 @@ namespace sprout { // sort // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort(Container const& cont, Compare comp) { return sprout::fixed::stable_sort(cont, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort(Container const& cont) { return sprout::fixed::stable_sort(cont); } diff --git a/sprout/algorithm/fixed/sort_heap.hpp b/sprout/algorithm/fixed/sort_heap.hpp index 28db94e0..bb7eed32 100644 --- a/sprout/algorithm/fixed/sort_heap.hpp +++ b/sprout/algorithm/fixed/sort_heap.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT @@ -21,7 +21,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_heap_impl( Container const& cont, Compare comp, typename sprout::container_traits::difference_type offset, @@ -48,7 +48,7 @@ namespace sprout { // sort_heap // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_heap(Container const& cont, Compare comp) { return sprout::fixed::detail::sort_heap_impl( cont, comp, @@ -57,7 +57,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sort_heap(Container const& cont) { return sprout::fixed::detail::sort_heap_impl( cont, NS_SSCRISK_CEL_OR_SPROUT::less::value_type>(), diff --git a/sprout/algorithm/fixed/stable_partition.hpp b/sprout/algorithm/fixed/stable_partition.hpp index c1130456..5ad35ee4 100644 --- a/sprout/algorithm/fixed/stable_partition.hpp +++ b/sprout/algorithm/fixed/stable_partition.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // stable_partition // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_partition(Container const& cont, Predicate pred) { return sprout::fixed::stable_partition_copy(sprout::begin(cont), sprout::end(cont), cont, pred); } diff --git a/sprout/algorithm/fixed/stable_partition_copy.hpp b/sprout/algorithm/fixed/stable_partition_copy.hpp index 47dbca50..efceac5f 100644 --- a/sprout/algorithm/fixed/stable_partition_copy.hpp +++ b/sprout/algorithm/fixed/stable_partition_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_partition_copy_impl_1( BidirectionalIterator, BidirectionalIterator, @@ -37,7 +37,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_partition_copy_impl_1( BidirectionalIterator first, BidirectionalIterator last, @@ -63,7 +63,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_partition_copy_impl( BidirectionalIterator, BidirectionalIterator, @@ -78,7 +78,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_partition_copy_impl( BidirectionalIterator first, BidirectionalIterator last, @@ -109,13 +109,13 @@ namespace sprout { // stable_partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_partition_copy(BidirectionalIterator first, BidirectionalIterator last, Result const& result, Predicate pred) { return sprout::fixed::detail::stable_partition_copy_impl(first, last, result, pred, sprout::size(result), first); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_partition_copy(BidirectionalIterator first, BidirectionalIterator last, Predicate pred) { return sprout::fixed::stable_partition_copy(first, last, sprout::pit(), pred); } diff --git a/sprout/algorithm/fixed/stable_sort.hpp b/sprout/algorithm/fixed/stable_sort.hpp index 125e4ffb..4d525952 100644 --- a/sprout/algorithm/fixed/stable_sort.hpp +++ b/sprout/algorithm/fixed/stable_sort.hpp @@ -13,14 +13,14 @@ #include #include #include -#include +#include #include namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_sort_impl_restart( Container const& cont, Compare comp, typename sprout::container_traits::size_type size, @@ -30,7 +30,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_sort_impl_synonym( Container const& cont, Compare, @@ -47,7 +47,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_sort_impl_synonym( Container const& cont, Compare comp, @@ -76,7 +76,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_sort_impl_restart_1( Container const& cont, Compare comp, typename sprout::container_traits::size_type size, @@ -116,7 +116,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_sort_impl_restart( Container const& cont, Compare comp, typename sprout::container_traits::size_type size, @@ -140,7 +140,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_sort_impl_1( Container const& cont, Compare comp, typename sprout::container_traits::size_type size, @@ -173,7 +173,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_sort_impl( Container const& cont, Compare comp, typename sprout::container_traits::size_type size @@ -192,7 +192,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size <= 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_sort(Container const& cont, Compare) { return sprout::deep_copy(cont); @@ -200,7 +200,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size > 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_sort(Container const& cont, Compare comp) { return sprout::fixed::detail::stable_sort_impl( @@ -211,7 +211,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size <= 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_sort(Container const& cont) { return sprout::deep_copy(cont); @@ -219,7 +219,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::container_traits::static_size > 1), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type stable_sort(Container const& cont) { return sprout::fixed::detail::stable_sort_impl( @@ -232,12 +232,12 @@ namespace sprout { // stable_sort // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_sort(Container const& cont, Compare comp) { return sprout::fixed::detail::stable_sort(cont, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_sort(Container const& cont) { return sprout::fixed::detail::stable_sort(cont); } diff --git a/sprout/algorithm/fixed/swap_element.hpp b/sprout/algorithm/fixed/swap_element.hpp index cdcd23ec..f35fe04f 100644 --- a/sprout/algorithm/fixed/swap_element.hpp +++ b/sprout/algorithm/fixed/swap_element.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // swap_element // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element( Container const& cont, typename sprout::container_traits::const_iterator pos1, diff --git a/sprout/algorithm/fixed/swap_element_copy.hpp b/sprout/algorithm/fixed/swap_element_copy.hpp index dacb295b..db51fe46 100644 --- a/sprout/algorithm/fixed/swap_element_copy.hpp +++ b/sprout/algorithm/fixed/swap_element_copy.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -24,7 +24,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, @@ -49,7 +49,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element_copy( RandomAccessIterator first, RandomAccessIterator last, Result const& result, @@ -71,7 +71,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type swap_element_copy_impl( ForwardIterator, ForwardIterator, @@ -86,7 +86,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type swap_element_copy_impl( ForwardIterator first, ForwardIterator last, @@ -105,7 +105,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element_copy( ForwardIterator first, ForwardIterator last, Result const& result, @@ -120,14 +120,14 @@ namespace sprout { // swap_element_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element_copy(ForwardIterator first, ForwardIterator last, Result const& result, ForwardIterator pos1, ForwardIterator pos2) { typedef typename std::iterator_traits::iterator_category* category; return sprout::fixed::detail::swap_element_copy(first, last, result, pos1, pos2, category()); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element_copy(ForwardIterator first, ForwardIterator last, ForwardIterator pos1, ForwardIterator pos2) { return sprout::fixed::swap_element_copy(first, last, sprout::pit(), pos1, pos2); } diff --git a/sprout/algorithm/fixed/transform.hpp b/sprout/algorithm/fixed/transform.hpp index 4eea74b8..55933807 100644 --- a/sprout/algorithm/fixed/transform.hpp +++ b/sprout/algorithm/fixed/transform.hpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include @@ -28,7 +28,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, UnaryOperation op, @@ -47,7 +47,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform( RandomAccessIterator first, RandomAccessIterator last, Result const& result, UnaryOperation op, @@ -67,7 +67,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform_impl( InputIterator, InputIterator, @@ -81,7 +81,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform_impl( InputIterator first, InputIterator last, @@ -96,7 +96,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform( InputIterator first, InputIterator last, Result const& result, UnaryOperation op, @@ -109,7 +109,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform(InputIterator first, InputIterator last, Result const& result, UnaryOperation op) { typedef typename std::iterator_traits::iterator_category* category; @@ -119,7 +119,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform(InputIterator first, InputIterator last, Result const& result, UnaryOperation op) { return sprout::remake( @@ -133,20 +133,20 @@ namespace sprout { // transform // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator first, InputIterator last, Result const& result, UnaryOperation op) { return sprout::fixed::detail::transform(first, last, result, op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator first, InputIterator last, UnaryOperation op) { return sprout::fixed::transform(first, last, sprout::pit(), op); } namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform_impl_ra( RandomAccessIterator1 first1, RandomAccessIterator1, RandomAccessIterator2 first2, Result const& result, BinaryOperation op, @@ -165,7 +165,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform( RandomAccessIterator1 first1, RandomAccessIterator1 last1, RandomAccessIterator2 first2, Result const& result, BinaryOperation op, @@ -184,7 +184,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform_impl( InputIterator1, InputIterator1, InputIterator2, @@ -198,7 +198,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform_impl( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, @@ -213,7 +213,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Result const& result, BinaryOperation op, @@ -226,7 +226,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Result const& result, BinaryOperation op) { typedef typename sprout::common_iterator_category::type* category; @@ -236,7 +236,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Result const& result, BinaryOperation op) { return sprout::remake( @@ -250,13 +250,13 @@ namespace sprout { // transform // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Result const& result, BinaryOperation op) { return sprout::fixed::detail::transform(first1, last1, first2, result, op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryOperation op) { return sprout::fixed::transform(first1, last1, first2, sprout::pit(), op); } @@ -266,7 +266,7 @@ namespace sprout { typename InputIterator, typename Result, typename UnaryOperation, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator first, InputIterator last, Result const& result, UnaryOperation op) { return sprout::fixed::transform(first, last, result, op); } @@ -274,7 +274,7 @@ namespace sprout { typename Result, typename InputIterator, typename UnaryOperation, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator first, InputIterator last, UnaryOperation op) { return sprout::fixed::transform(first, last, op); } @@ -283,7 +283,7 @@ namespace sprout { typename InputIterator1, typename InputIterator2, typename Result, typename BinaryOperation, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Result const& result, BinaryOperation op) { return sprout::fixed::transform(first1, last1, first2, result, op); } @@ -291,7 +291,7 @@ namespace sprout { typename Result, typename InputIterator1, typename InputIterator2, typename BinaryOperation, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryOperation op) { return sprout::fixed::transform(first1, last1, first2, op); } diff --git a/sprout/algorithm/fixed/unfold.hpp b/sprout/algorithm/fixed/unfold.hpp index eb23cf13..b19869e8 100644 --- a/sprout/algorithm/fixed/unfold.hpp +++ b/sprout/algorithm/fixed/unfold.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unfold_impl_1( Container const& cont, Generator const&, Next const& next, @@ -36,7 +36,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unfold_impl_1( Container const& cont, Generator const& gen, Next const& next, @@ -55,7 +55,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unfold_impl( Container const& cont, Generator const&, Init const&, typename sprout::container_traits::size_type size @@ -66,7 +66,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unfold_impl( Container const& cont, Generator const& gen, Init const& init, @@ -83,13 +83,13 @@ namespace sprout { // unfold // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unfold(Container const& cont, Generator const& gen, Init const& init) { return sprout::fixed::detail::unfold_impl(cont, gen, init, sprout::size(cont)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unfold(Generator const& gen, Init const& init) { return sprout::fixed::unfold(sprout::pit(), gen, init); } diff --git a/sprout/algorithm/fixed/unfold_n.hpp b/sprout/algorithm/fixed/unfold_n.hpp index 8d8f1b15..feebe3f0 100644 --- a/sprout/algorithm/fixed/unfold_n.hpp +++ b/sprout/algorithm/fixed/unfold_n.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include @@ -20,13 +20,13 @@ namespace sprout { // unfold_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unfold_n(Container const& cont, Size n, Generator const& gen, Init const& init) { return sprout::fixed::detail::unfold_impl(cont, gen, init, n); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unfold_n(Size n, Generator const& gen, Init const& init) { return sprout::fixed::unfold_n(sprout::pit(), n, gen, init); } diff --git a/sprout/algorithm/fixed/unique.hpp b/sprout/algorithm/fixed/unique.hpp index e0b2d101..1ddc96df 100644 --- a/sprout/algorithm/fixed/unique.hpp +++ b/sprout/algorithm/fixed/unique.hpp @@ -18,12 +18,12 @@ namespace sprout { // unique // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique(Container const& cont) { return sprout::fixed::unique_copy(sprout::begin(cont), sprout::end(cont), cont); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique(Container const& cont, BinaryPredicate pred) { return sprout::fixed::unique_copy(sprout::begin(cont), sprout::end(cont), cont, pred); } diff --git a/sprout/algorithm/fixed/unique_copy.hpp b/sprout/algorithm/fixed/unique_copy.hpp index 371e78ca..2820d537 100644 --- a/sprout/algorithm/fixed/unique_copy.hpp +++ b/sprout/algorithm/fixed/unique_copy.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy_impl( InputIterator, InputIterator, @@ -42,7 +42,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy_impl( InputIterator first, InputIterator last, @@ -63,7 +63,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy(InputIterator first, InputIterator last, Result const& result) { return first != last @@ -75,7 +75,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); @@ -90,13 +90,13 @@ namespace sprout { // unique_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::detail::unique_copy(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last) { return sprout::fixed::unique_copy(first, last, sprout::pit()); } @@ -105,7 +105,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy_impl( InputIterator, InputIterator, @@ -120,7 +120,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy_impl( InputIterator first, InputIterator last, @@ -141,7 +141,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy(InputIterator first, InputIterator last, Result const& result, BinaryPredicate pred) { return first != last @@ -153,7 +153,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type unique_copy(InputIterator first, InputIterator last, Result const& result, BinaryPredicate pred) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); @@ -168,13 +168,13 @@ namespace sprout { // unique_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last, Result const& result, BinaryPredicate pred) { return sprout::fixed::detail::unique_copy(first, last, result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last, BinaryPredicate pred) { return sprout::fixed::unique_copy(first, last, sprout::pit(), pred); } @@ -184,13 +184,13 @@ namespace sprout { typename InputIterator, typename Result, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::unique_copy(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last) { return sprout::fixed::unique_copy(first, last); } @@ -199,7 +199,7 @@ namespace sprout { typename InputIterator, typename Result, typename BinaryPredicate, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last, Result const& result, BinaryPredicate pred) { return sprout::fixed::unique_copy(first, last, result, pred); } @@ -208,7 +208,7 @@ namespace sprout { typename Result, typename InputIterator, typename BinaryPredicate, typename sprout::enabler_if::value>::type = sprout::enabler > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputIterator first, InputIterator last, BinaryPredicate pred) { return sprout::fixed::unique_copy(first, last, pred); } diff --git a/sprout/algorithm/none_of.hpp b/sprout/algorithm/none_of.hpp index cf5bf925..a0527771 100644 --- a/sprout/algorithm/none_of.hpp +++ b/sprout/algorithm/none_of.hpp @@ -103,7 +103,7 @@ namespace sprout { // recursion depth: // O(log N) // - template + template inline SPROUT_CONSTEXPR bool none_of(InputIterator first, InputIterator last, Predicate pred) { typedef typename std::iterator_traits::iterator_category* category; diff --git a/sprout/algorithm/string/fit/to_lower.hpp b/sprout/algorithm/string/fit/to_lower.hpp index 52583f76..c6581497 100644 --- a/sprout/algorithm/string/fit/to_lower.hpp +++ b/sprout/algorithm/string/fit/to_lower.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_lower_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // to_lower // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_lower(Container const& cont) { return sprout::algorithm::fit::detail::to_lower_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/string/fit/to_lower_copy.hpp b/sprout/algorithm/string/fit/to_lower_copy.hpp index 9aa580a4..9005249d 100644 --- a/sprout/algorithm/string/fit/to_lower_copy.hpp +++ b/sprout/algorithm/string/fit/to_lower_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_lower_copy_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -40,7 +40,7 @@ namespace sprout { // to_lower_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_lower_copy(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::algorithm::fit::detail::to_lower_copy_impl(first, last, result, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/string/fit/to_upper.hpp b/sprout/algorithm/string/fit/to_upper.hpp index f978c807..b33e7682 100644 --- a/sprout/algorithm/string/fit/to_upper.hpp +++ b/sprout/algorithm/string/fit/to_upper.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_upper_impl( Container const& cont, typename sprout::container_traits::difference_type offset @@ -38,7 +38,7 @@ namespace sprout { // to_upper // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_upper(Container const& cont) { return sprout::algorithm::fit::detail::to_upper_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/algorithm/string/fit/to_upper_copy.hpp b/sprout/algorithm/string/fit/to_upper_copy.hpp index 8c5aceef..42190ae0 100644 --- a/sprout/algorithm/string/fit/to_upper_copy.hpp +++ b/sprout/algorithm/string/fit/to_upper_copy.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_upper_copy_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -40,7 +40,7 @@ namespace sprout { // to_upper_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_upper_copy(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::algorithm::fit::detail::to_upper_copy_impl(first, last, result, sprout::internal_begin_offset(result)); diff --git a/sprout/algorithm/string/fixed/to_lower.hpp b/sprout/algorithm/string/fixed/to_lower.hpp index 36ea0cac..8491e478 100644 --- a/sprout/algorithm/string/fixed/to_lower.hpp +++ b/sprout/algorithm/string/fixed/to_lower.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // to_lower // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_lower(Container const& cont) { return sprout::algorithm::fixed::to_lower_copy(sprout::begin(cont), sprout::end(cont), cont); } diff --git a/sprout/algorithm/string/fixed/to_lower_copy.hpp b/sprout/algorithm/string/fixed/to_lower_copy.hpp index 5089ed6a..7e89f6c2 100644 --- a/sprout/algorithm/string/fixed/to_lower_copy.hpp +++ b/sprout/algorithm/string/fixed/to_lower_copy.hpp @@ -9,7 +9,7 @@ #define SPROUT_ALGORITHM_STRING_FIXED_TO_LOWER_COPY_HPP #include -#include +#include #include #include #include @@ -21,13 +21,13 @@ namespace sprout { // to_lower_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_lower_copy(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::transform(first, last, sprout::ctypes::to_lower<>(), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_lower_copy(InputIterator first, InputIterator last) { return sprout::algorithm::fixed::to_lower_copy(first, last, sprout::pit()); } diff --git a/sprout/algorithm/string/fixed/to_upper.hpp b/sprout/algorithm/string/fixed/to_upper.hpp index f3710d17..ec8d8de9 100644 --- a/sprout/algorithm/string/fixed/to_upper.hpp +++ b/sprout/algorithm/string/fixed/to_upper.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // to_upper // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_upper(Container const& cont) { return sprout::algorithm::fixed::to_upper_copy(sprout::begin(cont), sprout::end(cont), cont); } diff --git a/sprout/algorithm/string/fixed/to_upper_copy.hpp b/sprout/algorithm/string/fixed/to_upper_copy.hpp index d2f2ac51..3fe0e2a4 100644 --- a/sprout/algorithm/string/fixed/to_upper_copy.hpp +++ b/sprout/algorithm/string/fixed/to_upper_copy.hpp @@ -9,7 +9,7 @@ #define SPROUT_ALGORITHM_STRING_FIXED_TO_UPPER_COPY_HPP #include -#include +#include #include #include #include @@ -21,13 +21,13 @@ namespace sprout { // to_upper_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_upper_copy(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::transform(first, last, sprout::ctypes::to_upper<>(), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_upper_copy(InputIterator first, InputIterator last) { return sprout::algorithm::fixed::to_upper_copy(first, last, sprout::pit()); } diff --git a/sprout/algorithm/string/join.hpp b/sprout/algorithm/string/join.hpp index b3fbb560..be9e282f 100644 --- a/sprout/algorithm/string/join.hpp +++ b/sprout/algorithm/string/join.hpp @@ -65,7 +65,7 @@ namespace sprout { } } // namespace detail - namespace result_of { + namespace results { // // join // @@ -98,7 +98,7 @@ namespace sprout { * sprout::container_traits::static_size > {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -238,10 +238,10 @@ namespace sprout { >::iterator >::value , - typename sprout::algorithm::result_of::join::type + typename sprout::algorithm::results::join::type >::type join(ContainerContainer const& cont_cont) { - typedef typename sprout::algorithm::result_of::join::type result_type; + typedef typename sprout::algorithm::results::join::type result_type; return sprout::algorithm::detail::join_impl_ra(cont_cont); } template @@ -255,10 +255,10 @@ namespace sprout { >::iterator >::value ), - typename sprout::algorithm::result_of::join::type + typename sprout::algorithm::results::join::type >::type join(ContainerContainer const& cont_cont) { - typedef typename sprout::algorithm::result_of::join::type result_type; + typedef typename sprout::algorithm::results::join::type result_type; return sprout::algorithm::detail::join_impl( sprout::begin(cont_cont), sprout::end(cont_cont) @@ -269,7 +269,7 @@ namespace sprout { // join // template - inline SPROUT_CONSTEXPR typename sprout::algorithm::result_of::join::type + inline SPROUT_CONSTEXPR typename sprout::algorithm::results::join::type join(ContainerContainer const& cont_cont) { return sprout::algorithm::detail::join(cont_cont); } @@ -453,10 +453,10 @@ namespace sprout { typename sprout::container_traits::iterator >::value , - typename sprout::algorithm::result_of::join::type + typename sprout::algorithm::results::join::type >::type join(ContainerContainer const& cont_cont, Separator const& separator) { - typedef typename sprout::algorithm::result_of::join::type result_type; + typedef typename sprout::algorithm::results::join::type result_type; return sprout::algorithm::detail::join_impl_ra(cont_cont, separator); } template @@ -473,10 +473,10 @@ namespace sprout { typename sprout::container_traits::iterator >::value ), - typename sprout::algorithm::result_of::join::type + typename sprout::algorithm::results::join::type >::type join(ContainerContainer const& cont_cont, Separator const& separator) { - typedef typename sprout::algorithm::result_of::join::type result_type; + typedef typename sprout::algorithm::results::join::type result_type; return sprout::algorithm::detail::join_impl( sprout::begin(cont_cont), sprout::end(cont_cont), @@ -490,7 +490,7 @@ namespace sprout { // join // template - inline SPROUT_CONSTEXPR typename sprout::algorithm::result_of::join::type + inline SPROUT_CONSTEXPR typename sprout::algorithm::results::join::type join(ContainerContainer const& cont_cont, Separator const& separator) { return sprout::algorithm::detail::join(cont_cont, separator); } diff --git a/sprout/array/type_traits.hpp b/sprout/array/type_traits.hpp index 345d23d0..ba9f9e90 100644 --- a/sprout/array/type_traits.hpp +++ b/sprout/array/type_traits.hpp @@ -15,22 +15,22 @@ namespace sprout { // - // is_array + // is_array_class // template - struct is_array + struct is_array_class : public std::false_type {}; template - struct is_array - : public sprout::is_array + struct is_array_class + : public sprout::is_array_class {}; template - struct is_array - : public sprout::is_array + struct is_array_class + : public sprout::is_array_class {}; template - struct is_array > + struct is_array_class > : public std::true_type {}; } // namespace sprout diff --git a/sprout/bit/length.hpp b/sprout/bit/length.hpp index cccca85e..00f30060 100644 --- a/sprout/bit/length.hpp +++ b/sprout/bit/length.hpp @@ -39,7 +39,7 @@ namespace sprout { SPROUT_STATIC_CONSTEXPR std::size_t next_size = Size - 1; SPROUT_STATIC_CONSTEXPR std::size_t shift_bits = next_size * CHAR_BIT; private: - template + template SPROUT_CONSTEXPR IntType impl(IntType x, unsigned char i) const { return bit_len_8_table[i] @@ -48,7 +48,7 @@ namespace sprout { ; } public: - template + template SPROUT_CONSTEXPR IntType operator()(IntType x) const { return impl(x, static_cast((x >> shift_bits) & UCHAR_MAX)); diff --git a/sprout/bit/reverse.hpp b/sprout/bit/reverse.hpp index 66a5f53c..7db457cd 100644 --- a/sprout/bit/reverse.hpp +++ b/sprout/bit/reverse.hpp @@ -37,7 +37,7 @@ namespace sprout { SPROUT_STATIC_CONSTEXPR std::size_t next_size = Size / 2; SPROUT_STATIC_CONSTEXPR std::size_t shift_bits = next_size * CHAR_BIT; public: - template + template SPROUT_CONSTEXPR IntType operator()(IntType x) const { return (sprout::detail::bit_rev().template operator()(x) << shift_bits) @@ -72,7 +72,7 @@ namespace sprout { // // bit_reverse_in // - template + template inline SPROUT_CONSTEXPR typename std::enable_if< std::is_integral::value, IntType diff --git a/sprout/bitset/bitset.hpp b/sprout/bitset/bitset.hpp index bb495f99..e54cbab6 100644 --- a/sprout/bitset/bitset.hpp +++ b/sprout/bitset/bitset.hpp @@ -707,10 +707,10 @@ namespace sprout { base_bitset(base_bitset<0> const&) = default; SPROUT_CONSTEXPR base_bitset(unsigned long long) SPROUT_NOEXCEPT {} SPROUT_CONSTEXPR base_bitset(sprout::detail::base_bitset_from_words_construct_tag) {} - SPROUT_CXX14_CONSTEXPR base_bitset<0>& operator=(base_bitset<0> const& rhs) SPROUT_NOEXCEPT { + SPROUT_CXX14_CONSTEXPR base_bitset<0>& operator=(base_bitset<0> const&) SPROUT_NOEXCEPT { return *this; } - SPROUT_CXX14_CONSTEXPR base_bitset<0>& operator=(base_bitset<0>&& rhs) SPROUT_NOEXCEPT { + SPROUT_CXX14_CONSTEXPR base_bitset<0>& operator=(base_bitset<0>&&) SPROUT_NOEXCEPT { return *this; } diff --git a/sprout/brainfuck/brainfuck.hpp b/sprout/brainfuck/brainfuck.hpp index 85b3634d..bd9fc125 100644 --- a/sprout/brainfuck/brainfuck.hpp +++ b/sprout/brainfuck/brainfuck.hpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include HDR_ALGORITHM_MIN_MAX_SSCRISK_CEL_OR_SPROUT @@ -67,7 +67,7 @@ namespace sprout { typename BidirectionalIteratorSource, typename Output, typename InputIteratorInput, typename Buffer, typename OutputBuffer > - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec_impl( BidirectionalIteratorSource first, BidirectionalIteratorSource last, Output const& output, InputIteratorInput in_first, InputIteratorInput in_last, @@ -144,7 +144,7 @@ namespace sprout { // exec // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec( BidirectionalIteratorSource first, BidirectionalIteratorSource last, Output const& output, InputIteratorInput in_first, InputIteratorInput in_last @@ -158,7 +158,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec( BidirectionalIteratorSource first, BidirectionalIteratorSource last, Output const& output @@ -170,7 +170,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm< + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm< sprout::array::value_type, BufferSize> >::type exec( @@ -187,21 +187,21 @@ namespace sprout { // exec_range // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec_range(BidirectionalRangeSource const& source, Output const& output, InputRangeInput const& input) { return sprout::brainfuck::exec( sprout::begin(source), sprout::end(source), output, sprout::begin(input), sprout::end(input) ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec_range(BidirectionalRangeSource const& source, Output const& output) { return sprout::brainfuck::exec( sprout::begin(source), sprout::end(source), output ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm< + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm< sprout::array::value_type, BufferSize> >::type exec_range(BidirectionalRangeSource const& source) { diff --git a/sprout/brainfuck/detail/convert.hpp b/sprout/brainfuck/detail/convert.hpp index 9fe28541..467d51e9 100644 --- a/sprout/brainfuck/detail/convert.hpp +++ b/sprout/brainfuck/detail/convert.hpp @@ -10,21 +10,21 @@ #include #include -#include +#include #include namespace sprout { namespace brainfuck { namespace detail { template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> parsed_to_brainfuck(Parsed const& parsed, Result const& result) { return parsed.success() - ? sprout::pair::type, bool>( + ? sprout::pair::type, bool>( sprout::fixed::copy(sprout::begin(parsed.attr()), sprout::end(parsed.attr()), result), true ) - : sprout::pair::type, bool>( + : sprout::pair::type, bool>( sprout::deep_copy(result), false ) diff --git a/sprout/brainfuck/misa.hpp b/sprout/brainfuck/misa.hpp index 1029e24f..a8283258 100644 --- a/sprout/brainfuck/misa.hpp +++ b/sprout/brainfuck/misa.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -31,7 +31,7 @@ namespace sprout { // to_brainfuck // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> to_brainfuck(InputIterator first, InputIterator last, Result const& result) { return sprout::brainfuck::detail::parsed_to_brainfuck( sprout::weed::parse( @@ -65,7 +65,7 @@ namespace sprout { // exec_range // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec_range(BidirectionalRangeSource const& source, Output const& output, InputRangeInput const& input) { typedef typename sprout::container_construct_traits::copied_type copied_type; return sprout::brainfuck::exec_range( @@ -74,7 +74,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec_range(BidirectionalRangeSource const& source, Output const& output) { typedef typename sprout::container_construct_traits::copied_type copied_type; return sprout::brainfuck::exec_range( @@ -83,7 +83,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm< + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm< sprout::array::value_type, BufferSize> >::type exec_range(BidirectionalRangeSource const& source) { diff --git a/sprout/brainfuck/ook.hpp b/sprout/brainfuck/ook.hpp index becf1d1b..10d33a8c 100644 --- a/sprout/brainfuck/ook.hpp +++ b/sprout/brainfuck/ook.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -31,7 +31,7 @@ namespace sprout { // to_brainfuck // template - inline SPROUT_CONSTEXPR sprout::pair::type, bool> + inline SPROUT_CONSTEXPR sprout::pair::type, bool> to_brainfuck(InputIterator first, InputIterator last, Result const& result) { return sprout::brainfuck::detail::parsed_to_brainfuck( sprout::weed::parse( @@ -65,7 +65,7 @@ namespace sprout { // exec_range // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec_range(BidirectionalRangeSource const& source, Output const& output, InputRangeInput const& input) { typedef typename sprout::container_construct_traits::copied_type copied_type; return sprout::brainfuck::exec_range( @@ -74,7 +74,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type exec_range(BidirectionalRangeSource const& source, Output const& output) { typedef typename sprout::container_construct_traits::copied_type copied_type; return sprout::brainfuck::exec_range( @@ -83,7 +83,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm< + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm< sprout::array::value_type, BufferSize> >::type exec_range(BidirectionalRangeSource const& source) { diff --git a/sprout/compost/utility/iir_filter.hpp b/sprout/compost/utility/iir_filter.hpp index e31a8ff3..b38d60b6 100644 --- a/sprout/compost/utility/iir_filter.hpp +++ b/sprout/compost/utility/iir_filter.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -75,13 +75,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_lpf(T const& fc, T const& q, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_lpf_impl(sprout::compost::detail::iir_fc(fc), q, a, b); } @@ -127,13 +127,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_hpf(T const& fc, T const& q, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_hpf_impl(sprout::compost::detail::iir_fc(fc), q, a, b); } @@ -180,13 +180,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_bpf(T const& fc1, T const& fc2, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_bpf_impl( sprout::compost::detail::iir_fc(fc1), sprout::compost::detail::iir_fc(fc2), @@ -236,13 +236,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_bef(T const& fc1, T const& fc2, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_bef_impl( sprout::compost::detail::iir_fc(fc1), sprout::compost::detail::iir_fc(fc2), @@ -291,13 +291,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_resonator(T const& fc, T const& q, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_resonator_impl(sprout::compost::detail::iir_fc(fc), q, a, b); } @@ -343,13 +343,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_notch(T const& fc, T const& q, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_notch_impl(sprout::compost::detail::iir_fc(fc), q, a, b); } @@ -396,13 +396,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_low_shelving(T const& fc, T const& q, T const& g, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_low_shelving_impl( sprout::compost::detail::iir_fc(fc), q, sprout::compost::detail::iir_g(g), @@ -452,13 +452,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_high_shelving(T const& fc, T const& q, T const& g, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_high_shelving_impl( sprout::compost::detail::iir_fc(fc), q, sprout::compost::detail::iir_g(g), @@ -507,13 +507,13 @@ namespace sprout { // template inline SPROUT_CONSTEXPR sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > iir_peaking(T const& fc, T const& q, T const& g, A const& a, B const& b) { typedef sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > result_type; return sprout::compost::detail::iir_peaking_impl( sprout::compost::detail::iir_fc(fc), q, sprout::compost::detail::iir_g(g), @@ -541,16 +541,16 @@ namespace sprout { inline SPROUT_CONSTEXPR sprout::pair< T, sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > > apply_iir(T const& base, A const& a, B const& b, DelayA const& da, DelayB const& db) { typedef sprout::pair< T, sprout::pair< - typename sprout::fixed::result_of::algorithm::type, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type, + typename sprout::fixed::results::algorithm::type > > result_type; return sprout::compost::detail::apply_iir_impl( diff --git a/sprout/cstdint.hpp b/sprout/cstdint.hpp index 64929b03..47ac6306 100644 --- a/sprout/cstdint.hpp +++ b/sprout/cstdint.hpp @@ -11,12 +11,13 @@ #include #include #include +#include // // SPROUT_INT[N]_C // SPROUT_UINT[N]_C // -#if defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ == 2) && !defined(__STDC_CONSTANT_MACROS) +#if SPROUT_CLANG_BETWEEN(3, 2, 0, 3, 3, 0) && !defined(__STDC_CONSTANT_MACROS) # define SPROUT_INT8_C(n) n # define SPROUT_UINT8_C(n) n # define SPROUT_INT16_C(n) n diff --git a/sprout/detail/container_complate.hpp b/sprout/detail/container_complate.hpp index 0f419035..6af12ca8 100644 --- a/sprout/detail/container_complate.hpp +++ b/sprout/detail/container_complate.hpp @@ -13,14 +13,14 @@ #include #include #include -#include +#include namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_2(Result const& result, Args const&... args) { return sprout::remake(result, sprout::size(result), args...); @@ -28,7 +28,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_2(Result const& result, Args const&... args) { return container_complate_2(result, args..., *sprout::next(sprout::internal_begin(result), sizeof...(Args))); @@ -36,7 +36,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_1( Result const& result, @@ -49,7 +49,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_1( Result const& result, @@ -65,7 +65,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate(Result const& result, Args const&... args) { return sprout::remake(result, sprout::size(result), args...); @@ -73,7 +73,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate(Result const& result, Args const&... args) { return container_complate_1(result, sprout::internal_begin_offset(result), args...); diff --git a/sprout/detail/container_complate_backward.hpp b/sprout/detail/container_complate_backward.hpp index a9b3f40f..631b2bdf 100644 --- a/sprout/detail/container_complate_backward.hpp +++ b/sprout/detail/container_complate_backward.hpp @@ -13,14 +13,14 @@ #include #include #include -#include +#include namespace sprout { namespace detail { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_backward_2(Result const& result, Args const&... args) { return sprout::remake(result, sprout::size(result), args...); @@ -28,7 +28,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_backward_2(Result const& result, Args const&... args) { return container_complate_backward_2(result, *sprout::prev(sprout::internal_end(result), sizeof...(Args) + 1), args...); @@ -36,7 +36,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_backward_1( Result const& result, @@ -49,7 +49,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_backward_1( Result const& result, @@ -65,7 +65,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_backward(Result const& result, Args const&... args) { return sprout::remake(result, sprout::size(result), args...); @@ -73,7 +73,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type container_complate_backward(Result const& result, Args const&... args) { return container_complate_backward_1(result, sprout::internal_end_offset_backward(result), args...); diff --git a/sprout/detail/predef.hpp b/sprout/detail/predef.hpp new file mode 100644 index 00000000..ad93b5c4 --- /dev/null +++ b/sprout/detail/predef.hpp @@ -0,0 +1,123 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_DETAIL_PREDEF_HPP +#define SPROUT_DETAIL_PREDEF_HPP + +#include + +// +// SPROUT_IS_GCC +// +#if defined(__GNUC__) +# define SPROUT_IS_GCC (1) +#else +# define SPROUT_IS_GCC (0) +#endif +// +// SPROUT_GCC_LESS +// SPROUT_GCC_GREATER +// SPROUT_GCC_LESS_EQUAL +// SPROUT_GCC_GREATER_EQUAL +// +#if SPROUT_IS_GCC +# define SPROUT_GCC_LESS(major, minor, patch) ( \ + __GNUC__ < major \ + || (__GNUC__ == major && __GNUC_MINOR__ < minor) \ + || (__GNUC__ == major && __GNUC_MINOR__ == minor && __GNUC_PATCHLEVEL__ < patch) \ + ) +# define SPROUT_GCC_GREATER(major, minor, patch) ( \ + __GNUC__ > major \ + || (__GNUC__ == major && __GNUC_MINOR__ > minor) \ + || (__GNUC__ == major && __GNUC_MINOR__ == minor && __GNUC_PATCHLEVEL__ > patch) \ + ) +# define SPROUT_GCC_LESS_EQUAL(major, minor, patch) ( \ + __GNUC__ < major \ + || (__GNUC__ == major && __GNUC_MINOR__ < minor) \ + || (__GNUC__ == major && __GNUC_MINOR__ == minor && __GNUC_PATCHLEVEL__ <= patch) \ + ) +# define SPROUT_GCC_GREATER_EQUAL(major, minor, patch) ( \ + __GNUC__ > major \ + || (__GNUC__ == major && __GNUC_MINOR__ > minor) \ + || (__GNUC__ == major && __GNUC_MINOR__ == minor && __GNUC_PATCHLEVEL__ >= patch) \ + ) +#else +# define SPROUT_GCC_LESS(major, minor, patch) (0) +# define SPROUT_GCC_GREATER(major, minor, patch) (0) +# define SPROUT_GCC_LESS_EQUAL(major, minor, patch) (0) +# define SPROUT_GCC_GREATER_EQUAL(major, minor, patch) (0) +#endif +// +// SPROUT_GCC_BETWEEN +// +#if SPROUT_IS_GCC +# define SPROUT_GCC_BETWEEN(major1, minor1, patch1, major2, minor2, patch2) \ + SPROUT_GCC_GREATER_EQUAL(major1, minor1, patch1) && SPROUT_GCC_LESS(major2, minor2, patch2) +#else +# define SPROUT_GCC_BETWEEN(major1, minor1, patch1, major2, minor2, patch2) (0) +#endif + +// +// SPROUT_IS_CLANG +// +#if defined(__clang__) +# define SPROUT_IS_CLANG (1) +#else +# define SPROUT_IS_CLANG (0) +#endif +// +// SPROUT_CLANG_HAS_FUTURE +// +#if SPROUT_IS_CLANG +# define SPROUT_CLANG_HAS_FUTURE(future) (__has_feature(future)) +#else +# define SPROUT_CLANG_HAS_FUTURE(future) (0) +#endif +// +// SPROUT_CLANG_LESS +// SPROUT_CLANG_GREATER +// SPROUT_CLANG_LESS_EQUAL +// SPROUT_CLANG_GREATER_EQUAL +// +#if SPROUT_IS_CLANG +# define SPROUT_CLANG_LESS(major, minor, patch) ( \ + __clang_major__ < major \ + || (__clang_major__ == major && __clang_minor__ < minor) \ + || (__clang_major__ == major && __clang_minor__ == minor && __clang_patchlevel__ < patch) \ + ) +# define SPROUT_CLANG_GREATER(major, minor, patch) ( \ + __clang_major__ > major \ + || (__clang_major__ == major && __clang_minor__ > minor) \ + || (__clang_major__ == major && __clang_minor__ == minor && __clang_patchlevel__ > patch) \ + ) +# define SPROUT_CLANG_LESS_EQUAL(major, minor, patch) ( \ + __clang_major__ < major \ + || (__clang_major__ == major && __clang_minor__ < minor) \ + || (__clang_major__ == major && __clang_minor__ == minor && __clang_patchlevel__ <= patch) \ + ) +# define SPROUT_CLANG_GREATER_EQUAL(major, minor, patch) ( \ + __clang_major__ > major \ + || (__clang_major__ == major && __clang_minor__ > minor) \ + || (__clang_major__ == major && __clang_minor__ == minor && __clang_patchlevel__ >= patch) \ + ) +#else +# define SPROUT_CLANG_LESS(major, minor, patch) (0) +# define SPROUT_CLANG_GREATER(major, minor, patch) (0) +# define SPROUT_CLANG_LESS_EQUAL(major, minor, patch) (0) +# define SPROUT_CLANG_GREATER_EQUAL(major, minor, patch) (0) +#endif +// +// SPROUT_CLANG_BETWEEN +// +#if SPROUT_IS_CLANG +# define SPROUT_CLANG_BETWEEN(major1, minor1, patch1, major2, minor2, patch2) \ + SPROUT_CLANG_GREATER_EQUAL(major1, minor1, patch1) && SPROUT_CLANG_LESS(major2, minor2, patch2) +#else +# define SPROUT_CLANG_BETWEEN(major1, minor1, patch1, major2, minor2, patch2) (0) +#endif + +#endif // #ifndef SPROUT_DETAIL_PREDEF_HPP diff --git a/sprout/functional/hash/hash_value_traits.hpp b/sprout/functional/hash/hash_value_traits.hpp index d4353ccd..e8d24de7 100644 --- a/sprout/functional/hash/hash_value_traits.hpp +++ b/sprout/functional/hash/hash_value_traits.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace hash_detail { - template + template struct is_basic_number : public std::integral_constant< bool, @@ -26,7 +26,7 @@ namespace sprout { && (sizeof(T) <= sizeof(std::size_t)) > {}; - template + template struct is_long_number : public std::integral_constant< bool, @@ -35,7 +35,7 @@ namespace sprout { && std::is_signed::value > {}; - template + template struct is_ulong_number : public std::integral_constant< bool, diff --git a/sprout/numeric/dft/fit/amplitude_spectrum.hpp b/sprout/numeric/dft/fit/amplitude_spectrum.hpp index a6a15faa..e28477a8 100644 --- a/sprout/numeric/dft/fit/amplitude_spectrum.hpp +++ b/sprout/numeric/dft/fit/amplitude_spectrum.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type amplitude_spectrum_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -40,14 +40,14 @@ namespace sprout { // amplitude_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type amplitude_spectrum(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::amplitude_spectrum_impl(first, last, result, sprout::internal_begin_offset(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type amplitude_spectrum(InputIterator first, InputIterator last) { return sprout::fit::amplitude_spectrum(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fit/dft.hpp b/sprout/numeric/dft/fit/dft.hpp index 789d6fc5..52595743 100644 --- a/sprout/numeric/dft/fit/dft.hpp +++ b/sprout/numeric/dft/fit/dft.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type dft_impl( ForwardIterator first, ForwardIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -39,13 +39,13 @@ namespace sprout { // dft // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type dft(ForwardIterator first, ForwardIterator last, Result const& result) { return sprout::fit::detail::dft_impl(first, last, result, sprout::internal_begin_offset(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft(ForwardIterator first, ForwardIterator last) { return sprout::fit::dft(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fit/idft.hpp b/sprout/numeric/dft/fit/idft.hpp index c4742443..44360eb5 100644 --- a/sprout/numeric/dft/fit/idft.hpp +++ b/sprout/numeric/dft/fit/idft.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type idft_impl( ForwardIterator first, ForwardIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -39,13 +39,13 @@ namespace sprout { // idft // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type idft(ForwardIterator first, ForwardIterator last, Result const& result) { return sprout::fit::detail::idft_impl(first, last, result, sprout::internal_begin_offset(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft(ForwardIterator first, ForwardIterator last) { return sprout::fit::idft(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fit/phase_spectrum.hpp b/sprout/numeric/dft/fit/phase_spectrum.hpp index d63c4c61..ad894378 100644 --- a/sprout/numeric/dft/fit/phase_spectrum.hpp +++ b/sprout/numeric/dft/fit/phase_spectrum.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type phase_spectrum_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -40,14 +40,14 @@ namespace sprout { // phase_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type phase_spectrum(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::phase_spectrum_impl(first, last, result, sprout::internal_begin_offset(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type phase_spectrum(InputIterator first, InputIterator last) { return sprout::fit::phase_spectrum(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fit/sawtooth.hpp b/sprout/numeric/dft/fit/sawtooth.hpp index b29d7217..47952430 100644 --- a/sprout/numeric/dft/fit/sawtooth.hpp +++ b/sprout/numeric/dft/fit/sawtooth.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sawtooth_impl( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -41,7 +41,7 @@ namespace sprout { // sawtooth // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sawtooth( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -53,7 +53,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sawtooth( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/dft/fit/sinusoid.hpp b/sprout/numeric/dft/fit/sinusoid.hpp index 48ae3a44..369860aa 100644 --- a/sprout/numeric/dft/fit/sinusoid.hpp +++ b/sprout/numeric/dft/fit/sinusoid.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sinusoid_impl( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -41,7 +41,7 @@ namespace sprout { // sinusoid // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sinusoid( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -53,7 +53,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type sinusoid( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/dft/fit/spectrum.hpp b/sprout/numeric/dft/fit/spectrum.hpp index 1590c0f2..5e50aac5 100644 --- a/sprout/numeric/dft/fit/spectrum.hpp +++ b/sprout/numeric/dft/fit/spectrum.hpp @@ -9,7 +9,7 @@ #define SPROUT_NUMERIC_DFT_FIT_SPECTRUM_HPP #include -#include +#include #include namespace sprout { @@ -18,13 +18,13 @@ namespace sprout { // spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type spectrum(InputIterator first, InputIterator last, Result const& result) { return sprout::fit::amplitude_spectrum(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type spectrum(InputIterator first, InputIterator last) { return sprout::fit::amplitude_spectrum(first, last); } diff --git a/sprout/numeric/dft/fit/square.hpp b/sprout/numeric/dft/fit/square.hpp index 9f153615..7771ebf3 100644 --- a/sprout/numeric/dft/fit/square.hpp +++ b/sprout/numeric/dft/fit/square.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type square_impl( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -42,7 +42,7 @@ namespace sprout { // square // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type square( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -55,7 +55,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type square( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/dft/fit/triangle.hpp b/sprout/numeric/dft/fit/triangle.hpp index e14be23b..5d5db41d 100644 --- a/sprout/numeric/dft/fit/triangle.hpp +++ b/sprout/numeric/dft/fit/triangle.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type triangle_impl( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -41,7 +41,7 @@ namespace sprout { // triangle // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type triangle( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -53,7 +53,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type triangle( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/dft/fixed/amplitude_spectrum.hpp b/sprout/numeric/dft/fixed/amplitude_spectrum.hpp index 3d0d6a1c..597f88c3 100644 --- a/sprout/numeric/dft/fixed/amplitude_spectrum.hpp +++ b/sprout/numeric/dft/fixed/amplitude_spectrum.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type amplitude_spectrum_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, sprout::index_tuple, @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type amplitude_spectrum( RandomAccessIterator first, RandomAccessIterator last, Result const& result, std::random_access_iterator_tag* @@ -63,7 +63,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type amplitude_spectrum_impl( ForwardIterator, ForwardIterator, Result const& result, @@ -76,7 +76,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type amplitude_spectrum_impl( ForwardIterator first, ForwardIterator last, Result const& result, @@ -93,7 +93,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type amplitude_spectrum( ForwardIterator first, ForwardIterator last, Result const& result, std::forward_iterator_tag* @@ -105,7 +105,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type amplitude_spectrum(InputIterator first, InputIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -115,7 +115,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type amplitude_spectrum(InputIterator first, InputIterator last, Result const& result) { return sprout::remake( @@ -129,13 +129,13 @@ namespace sprout { // amplitude_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type amplitude_spectrum(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::detail::amplitude_spectrum(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type amplitude_spectrum(ForwardIterator first, ForwardIterator last) { return sprout::fixed::amplitude_spectrum(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fixed/dft.hpp b/sprout/numeric/dft/fixed/dft.hpp index 47668ab0..a2a1821d 100644 --- a/sprout/numeric/dft/fixed/dft.hpp +++ b/sprout/numeric/dft/fixed/dft.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft_impl_ra( RandomAccessIterator first, RandomAccessIterator last, Result const& result, sprout::index_tuple, @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft( RandomAccessIterator first, RandomAccessIterator last, Result const& result, std::random_access_iterator_tag* @@ -63,7 +63,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type dft_impl( ForwardIterator, ForwardIterator, Result const& result, @@ -77,7 +77,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type dft_impl( ForwardIterator first, ForwardIterator last, Result const& result, @@ -95,7 +95,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft( ForwardIterator first, ForwardIterator last, Result const& result, std::forward_iterator_tag* @@ -107,7 +107,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type dft(ForwardIterator first, ForwardIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -117,7 +117,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type dft(ForwardIterator first, ForwardIterator last, Result const& result) { return sprout::remake( @@ -131,13 +131,13 @@ namespace sprout { // dft // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft(ForwardIterator first, ForwardIterator last, Result const& result) { return sprout::fixed::detail::dft(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft(ForwardIterator first, ForwardIterator last) { return sprout::fixed::dft(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fixed/idft.hpp b/sprout/numeric/dft/fixed/idft.hpp index 82e2a190..f0901cbe 100644 --- a/sprout/numeric/dft/fixed/idft.hpp +++ b/sprout/numeric/dft/fixed/idft.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft_impl_ra( RandomAccessIterator first, RandomAccessIterator last, Result const& result, sprout::index_tuple, @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft( RandomAccessIterator first, RandomAccessIterator last, Result const& result, std::random_access_iterator_tag* @@ -63,7 +63,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type idft_impl( ForwardIterator, ForwardIterator, Result const& result, @@ -77,7 +77,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type idft_impl( ForwardIterator first, ForwardIterator last, Result const& result, @@ -95,7 +95,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft( ForwardIterator first, ForwardIterator last, Result const& result, std::forward_iterator_tag* @@ -107,7 +107,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type idft(ForwardIterator first, ForwardIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -117,7 +117,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type idft(ForwardIterator first, ForwardIterator last, Result const& result) { return sprout::remake( @@ -131,13 +131,13 @@ namespace sprout { // idft // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft(ForwardIterator first, ForwardIterator last, Result const& result) { return sprout::fixed::detail::idft(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft(ForwardIterator first, ForwardIterator last) { return sprout::fixed::idft(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fixed/phase_spectrum.hpp b/sprout/numeric/dft/fixed/phase_spectrum.hpp index 6fdd2280..7674790c 100644 --- a/sprout/numeric/dft/fixed/phase_spectrum.hpp +++ b/sprout/numeric/dft/fixed/phase_spectrum.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type phase_spectrum_impl_ra( RandomAccessIterator first, RandomAccessIterator, Result const& result, sprout::index_tuple, @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type phase_spectrum( RandomAccessIterator first, RandomAccessIterator last, Result const& result, std::random_access_iterator_tag* @@ -63,7 +63,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type phase_spectrum_impl( ForwardIterator, ForwardIterator, Result const& result, @@ -76,7 +76,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type phase_spectrum_impl( ForwardIterator first, ForwardIterator last, Result const& result, @@ -93,7 +93,7 @@ namespace sprout { ; } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type phase_spectrum( ForwardIterator first, ForwardIterator last, Result const& result, std::forward_iterator_tag* @@ -105,7 +105,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type phase_spectrum(InputIterator first, InputIterator last, Result const& result) { typedef typename std::iterator_traits::iterator_category* category; @@ -115,7 +115,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type phase_spectrum(InputIterator first, InputIterator last, Result const& result) { return sprout::remake( @@ -129,13 +129,13 @@ namespace sprout { // phase_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type phase_spectrum(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::detail::phase_spectrum(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type phase_spectrum(ForwardIterator first, ForwardIterator last) { return sprout::fixed::phase_spectrum(first, last, sprout::pit()); } diff --git a/sprout/numeric/dft/fixed/sawtooth.hpp b/sprout/numeric/dft/fixed/sawtooth.hpp index e537c942..87343829 100644 --- a/sprout/numeric/dft/fixed/sawtooth.hpp +++ b/sprout/numeric/dft/fixed/sawtooth.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -29,7 +29,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sawtooth_impl( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -50,7 +50,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sawtooth( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -73,7 +73,7 @@ namespace sprout { // sawtooth // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sawtooth( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -85,7 +85,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sawtooth( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/dft/fixed/sinusoid.hpp b/sprout/numeric/dft/fixed/sinusoid.hpp index 09063cf1..7dce1614 100644 --- a/sprout/numeric/dft/fixed/sinusoid.hpp +++ b/sprout/numeric/dft/fixed/sinusoid.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sinusoid_impl( Container const& cont, typename sprout::container_traits::value_type const& d, @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sinusoid( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -69,7 +69,7 @@ namespace sprout { // sinusoid // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sinusoid( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -81,7 +81,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type sinusoid( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/dft/fixed/spectrum.hpp b/sprout/numeric/dft/fixed/spectrum.hpp index 5b303cd6..1fff8e18 100644 --- a/sprout/numeric/dft/fixed/spectrum.hpp +++ b/sprout/numeric/dft/fixed/spectrum.hpp @@ -9,7 +9,7 @@ #define SPROUT_NUMERIC_DFT_FIXED_SPECTRUM_HPP #include -#include +#include #include namespace sprout { @@ -18,13 +18,13 @@ namespace sprout { // spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type spectrum(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::amplitude_spectrum(first, last, result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type spectrum(InputIterator first, InputIterator last) { return sprout::fixed::amplitude_spectrum(first, last); } diff --git a/sprout/numeric/dft/fixed/square.hpp b/sprout/numeric/dft/fixed/square.hpp index 0bf3a8e5..72b1b150 100644 --- a/sprout/numeric/dft/fixed/square.hpp +++ b/sprout/numeric/dft/fixed/square.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type square_impl( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -50,7 +50,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type square( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -75,7 +75,7 @@ namespace sprout { // square // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type square( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -88,7 +88,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type square( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/dft/fixed/triangle.hpp b/sprout/numeric/dft/fixed/triangle.hpp index 45c1f51c..f170268b 100644 --- a/sprout/numeric/dft/fixed/triangle.hpp +++ b/sprout/numeric/dft/fixed/triangle.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,7 +32,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type triangle_impl( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -53,7 +53,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type triangle( Container const& cont, typename sprout::container_traits::value_type const& frequency, @@ -76,7 +76,7 @@ namespace sprout { // triangle // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type triangle( Container const& cont, typename sprout::container_traits::value_type const& frequency = 1, @@ -88,7 +88,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type triangle( typename sprout::container_traits::value_type const& frequency = 1, typename sprout::container_traits::value_type const& amplitude = 1, diff --git a/sprout/numeric/fft/fit/bitrev_table.hpp b/sprout/numeric/fft/fit/bitrev_table.hpp index adc8cab6..22dd11e9 100644 --- a/sprout/numeric/fft/fit/bitrev_table.hpp +++ b/sprout/numeric/fft/fit/bitrev_table.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bitrev_table_impl(Container const& cont, typename sprout::container_traits::difference_type offset) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::bitrev_table(cont)), @@ -34,7 +34,7 @@ namespace sprout { // bitrev_table // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type bitrev_table(Container const& cont) { return sprout::fit::detail::bitrev_table_impl(cont, sprout::internal_begin_offset(cont)); } diff --git a/sprout/numeric/fft/fixed/bitrev_table.hpp b/sprout/numeric/fft/fixed/bitrev_table.hpp index 5ac4624a..b3bbd13a 100644 --- a/sprout/numeric/fft/fixed/bitrev_table.hpp +++ b/sprout/numeric/fft/fixed/bitrev_table.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -24,7 +24,7 @@ namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type bitrev_table_impl( Container const& cont, sprout::index_tuple, std::size_t bit_length, @@ -49,7 +49,7 @@ namespace sprout { // bitrev_table // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type bitrev_table(Container const& cont) { return sprout::fixed::detail::bitrev_table_impl( cont, diff --git a/sprout/numeric/fit/adjacent_difference.hpp b/sprout/numeric/fit/adjacent_difference.hpp index a82d3278..632b201c 100644 --- a/sprout/numeric/fit/adjacent_difference.hpp +++ b/sprout/numeric/fit/adjacent_difference.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -39,7 +39,7 @@ namespace sprout { // adjacent_difference // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::adjacent_difference_impl(first, last, result, sprout::internal_begin_offset(result)); @@ -47,7 +47,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference_impl( InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op, typename sprout::container_traits::difference_type offset @@ -64,7 +64,7 @@ namespace sprout { // adjacent_difference // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference(InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::adjacent_difference_impl(first, last, result, binary_op, sprout::internal_begin_offset(result)); diff --git a/sprout/numeric/fit/iota.hpp b/sprout/numeric/fit/iota.hpp index 8e130c9a..d3798ec4 100644 --- a/sprout/numeric/fit/iota.hpp +++ b/sprout/numeric/fit/iota.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type iota_impl( Container const& cont, T const& value, typename sprout::container_traits::difference_type offset @@ -37,7 +37,7 @@ namespace sprout { // iota // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type iota(Container const& cont, T const& value) { return sprout::fit::detail::iota_impl(cont, value, sprout::internal_begin_offset(cont)); } diff --git a/sprout/numeric/fit/partial_sum.hpp b/sprout/numeric/fit/partial_sum.hpp index bf7e00d8..6c48b4e3 100644 --- a/sprout/numeric/fit/partial_sum.hpp +++ b/sprout/numeric/fit/partial_sum.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ namespace sprout { namespace fit { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum_impl( InputIterator first, InputIterator last, Result const& result, typename sprout::container_traits::difference_type offset @@ -39,7 +39,7 @@ namespace sprout { // partial_sum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum(InputIterator first, InputIterator last, Result const& result) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::partial_sum_impl(first, last, result, sprout::internal_begin_offset(result)); @@ -47,7 +47,7 @@ namespace sprout { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum_impl( InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op, typename sprout::container_traits::difference_type offset @@ -64,7 +64,7 @@ namespace sprout { // partial_sum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum(InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op) { static_assert(sprout::is_forward_iterator::value, "Sorry, not implemented."); return sprout::fit::detail::partial_sum_impl(first, last, result, binary_op, sprout::internal_begin_offset(result)); diff --git a/sprout/numeric/fixed/adjacent_difference.hpp b/sprout/numeric/fixed/adjacent_difference.hpp index 062de262..a24442c1 100644 --- a/sprout/numeric/fixed/adjacent_difference.hpp +++ b/sprout/numeric/fixed/adjacent_difference.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl_1( InputIterator, InputIterator, Result const& result, @@ -37,7 +37,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl_1( InputIterator first, InputIterator last, Result const& result, @@ -54,7 +54,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl( InputIterator, InputIterator, Result const& result, @@ -66,7 +66,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl_1( InputIterator first, InputIterator last, Result const& result, @@ -83,13 +83,13 @@ namespace sprout { // adjacent_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::detail::adjacent_difference_impl(first, last, result, sprout::size(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputIterator first, InputIterator last) { return sprout::fixed::adjacent_difference(first, last, sprout::pit()); } @@ -98,7 +98,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl_1( InputIterator, InputIterator, Result const& result, BinaryOperation, @@ -112,7 +112,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args), - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl_1( InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op, @@ -129,7 +129,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl( InputIterator, InputIterator, Result const& result, BinaryOperation, @@ -141,7 +141,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type adjacent_difference_impl_1( InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op, @@ -158,13 +158,13 @@ namespace sprout { // adjacent_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op) { return sprout::fixed::detail::adjacent_difference_impl(first, last, result, binary_op, sprout::size(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputIterator first, InputIterator last, BinaryOperation binary_op) { return sprout::fixed::adjacent_difference(first, last, sprout::pit(), binary_op); } diff --git a/sprout/numeric/fixed/iota.hpp b/sprout/numeric/fixed/iota.hpp index 3d6aef97..f8977191 100644 --- a/sprout/numeric/fixed/iota.hpp +++ b/sprout/numeric/fixed/iota.hpp @@ -15,14 +15,14 @@ #include #include #include -#include +#include #include namespace sprout { namespace fixed { namespace detail { template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type iota_impl( Container const& cont, sprout::index_tuple, T value, @@ -43,7 +43,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type iota(Container const& cont, T value) { return sprout::fixed::detail::iota_impl( @@ -57,7 +57,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_fixed_container::value, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type iota(Container const& cont, T value) { return sprout::remake( @@ -71,13 +71,13 @@ namespace sprout { // iota // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type iota(Container const& cont, T value) { return sprout::fixed::detail::iota(cont, value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type iota(T value) { return sprout::fixed::detail::iota(sprout::pit(), value); } diff --git a/sprout/numeric/fixed/partial_sum.hpp b/sprout/numeric/fixed/partial_sum.hpp index 228828b8..1d6a6baa 100644 --- a/sprout/numeric/fixed/partial_sum.hpp +++ b/sprout/numeric/fixed/partial_sum.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl_1( InputIterator, InputIterator, Result const& result, @@ -37,7 +37,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl_1( InputIterator first, InputIterator last, Result const& result, @@ -54,7 +54,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl( InputIterator, InputIterator, Result const& result, @@ -66,7 +66,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl( InputIterator first, InputIterator last, Result const& result, @@ -83,13 +83,13 @@ namespace sprout { // partial_sum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputIterator first, InputIterator last, Result const& result) { return sprout::fixed::detail::partial_sum_impl(first, last, result, sprout::size(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputIterator first, InputIterator last) { return sprout::fixed::partial_sum(first, last, sprout::pit()); } @@ -98,7 +98,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl_1( InputIterator, InputIterator, Result const& result, BinaryOperation, @@ -112,7 +112,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != sizeof...(Args) + 1, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl_1( InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op, @@ -129,7 +129,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size == 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl( InputIterator, InputIterator, Result const& result, BinaryOperation, @@ -141,7 +141,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::container_traits::static_size != 0, - typename sprout::fixed::result_of::algorithm::type + typename sprout::fixed::results::algorithm::type >::type partial_sum_impl( InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op, @@ -158,13 +158,13 @@ namespace sprout { // partial_sum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputIterator first, InputIterator last, Result const& result, BinaryOperation binary_op) { return sprout::fixed::detail::partial_sum_impl(first, last, result, binary_op, sprout::size(result)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputIterator first, InputIterator last, BinaryOperation binary_op) { return sprout::fixed::partial_sum(first, last, sprout::pit(), binary_op); } diff --git a/sprout/operation/fit/append.hpp b/sprout/operation/fit/append.hpp index e9118fe8..f171cfb2 100644 --- a/sprout/operation/fit/append.hpp +++ b/sprout/operation/fit/append.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // append // @@ -26,17 +26,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::append::type + typename sprout::fixed::results::append::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // append // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::append::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::append::type append( Container const& cont, typename sprout::container_traits::const_iterator pos, Input const& input @@ -49,7 +49,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::append::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::append::type append( Container const& cont, typename sprout::container_traits::difference_type pos, Input const& input diff --git a/sprout/operation/fit/append_back.hpp b/sprout/operation/fit/append_back.hpp index 17be68d6..bf2c5501 100644 --- a/sprout/operation/fit/append_back.hpp +++ b/sprout/operation/fit/append_back.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // append_back // @@ -25,17 +25,17 @@ namespace sprout { struct append_back { typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::append_back::type + typename sprout::fixed::results::append_back::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // append_back // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::append_back::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::append_back::type append_back(Container const& cont, Input const& input) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::append_back(cont, input)), diff --git a/sprout/operation/fit/append_front.hpp b/sprout/operation/fit/append_front.hpp index 3d3ffa03..c6b0f6a0 100644 --- a/sprout/operation/fit/append_front.hpp +++ b/sprout/operation/fit/append_front.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // append_front // @@ -25,17 +25,17 @@ namespace sprout { struct append_front { typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::append_front::type + typename sprout::fixed::results::append_front::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // append_front // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::append_front::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::append_front::type append_front(Container const& cont, Input const& input) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::append_front(cont, input)), diff --git a/sprout/operation/fit/erase.hpp b/sprout/operation/fit/erase.hpp index 0c1c2331..e354aaca 100644 --- a/sprout/operation/fit/erase.hpp +++ b/sprout/operation/fit/erase.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // erase // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::erase::type + typename sprout::fixed::results::erase::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // erase // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::erase::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::erase::type erase(Container const& cont, typename sprout::container_traits::const_iterator pos) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::erase(cont, pos)), @@ -46,7 +46,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::erase::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::erase::type erase(Container const& cont, typename sprout::container_traits::difference_type pos) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::erase(cont, pos)), diff --git a/sprout/operation/fit/erase_n.hpp b/sprout/operation/fit/erase_n.hpp index eb1275f9..72590ab5 100644 --- a/sprout/operation/fit/erase_n.hpp +++ b/sprout/operation/fit/erase_n.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // erase_n // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::erase_n::type + typename sprout::fixed::results::erase_n::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // erase_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::erase_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::erase_n::type erase_n(Container const& cont, typename sprout::container_traits::const_iterator pos) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::erase_n(cont, pos)), @@ -46,7 +46,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::erase_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::erase_n::type erase_n(Container const& cont, typename sprout::container_traits::difference_type pos) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::erase_n(cont, pos)), diff --git a/sprout/operation/fit/insert.hpp b/sprout/operation/fit/insert.hpp index da771530..c7639d4a 100644 --- a/sprout/operation/fit/insert.hpp +++ b/sprout/operation/fit/insert.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // insert // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::insert::type + typename sprout::fixed::results::insert::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // insert // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::insert::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::insert::type insert( Container const& cont, typename sprout::container_traits::const_iterator pos, T const& v, Values const&... values @@ -50,7 +50,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::insert::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::insert::type insert( Container const& cont, typename sprout::container_traits::difference_type pos, T const& v, Values const&... values diff --git a/sprout/operation/fit/insert_n.hpp b/sprout/operation/fit/insert_n.hpp index 12245760..aa5702d6 100644 --- a/sprout/operation/fit/insert_n.hpp +++ b/sprout/operation/fit/insert_n.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // insert_n // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::insert_n::type + typename sprout::fixed::results::insert_n::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // insert_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::insert_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::insert_n::type insert_n( Container const& cont, typename sprout::container_traits::const_iterator pos, T const& v, Values const&... values @@ -50,7 +50,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::insert_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::insert_n::type insert_n( Container const& cont, typename sprout::container_traits::difference_type pos, T const& v, Values const&... values diff --git a/sprout/operation/fit/pop_back.hpp b/sprout/operation/fit/pop_back.hpp index d4bd4ad5..658640a3 100644 --- a/sprout/operation/fit/pop_back.hpp +++ b/sprout/operation/fit/pop_back.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // pop_back // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::pop_back::type + typename sprout::fixed::results::pop_back::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // pop_back // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::pop_back::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::pop_back::type pop_back(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::pop_back(cont)), diff --git a/sprout/operation/fit/pop_back_n.hpp b/sprout/operation/fit/pop_back_n.hpp index 35c3e13e..7ed04dae 100644 --- a/sprout/operation/fit/pop_back_n.hpp +++ b/sprout/operation/fit/pop_back_n.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // pop_back_n // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::pop_back_n::type + typename sprout::fixed::results::pop_back_n::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // pop_back_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::pop_back_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::pop_back_n::type pop_back_n(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::pop_back_n(cont)), diff --git a/sprout/operation/fit/pop_front.hpp b/sprout/operation/fit/pop_front.hpp index a877ec21..a468dc5a 100644 --- a/sprout/operation/fit/pop_front.hpp +++ b/sprout/operation/fit/pop_front.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // pop_front // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::pop_front::type + typename sprout::fixed::results::pop_front::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // pop_front // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::pop_front::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::pop_front::type pop_front(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::pop_front(cont)), diff --git a/sprout/operation/fit/pop_front_n.hpp b/sprout/operation/fit/pop_front_n.hpp index 1566fdac..2973f22b 100644 --- a/sprout/operation/fit/pop_front_n.hpp +++ b/sprout/operation/fit/pop_front_n.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // pop_front_n // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::pop_front_n::type + typename sprout::fixed::results::pop_front_n::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // pop_front_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::pop_front_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::pop_front_n::type pop_front_n(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::pop_front_n(cont)), diff --git a/sprout/operation/fit/push_back.hpp b/sprout/operation/fit/push_back.hpp index 466a8ef1..49b6e54e 100644 --- a/sprout/operation/fit/push_back.hpp +++ b/sprout/operation/fit/push_back.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // push_back // @@ -26,17 +26,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::push_back::type + typename sprout::fixed::results::push_back::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // push_back // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::push_back::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::push_back::type push_back(Container const& cont, T const& v, Values const&... values) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::push_back(cont, v, values...)), diff --git a/sprout/operation/fit/push_back_n.hpp b/sprout/operation/fit/push_back_n.hpp index 55073ae7..c8e416b2 100644 --- a/sprout/operation/fit/push_back_n.hpp +++ b/sprout/operation/fit/push_back_n.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // push_back_n // @@ -26,17 +26,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::push_back_n::type + typename sprout::fixed::results::push_back_n::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // push_back_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::push_back_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::push_back_n::type push_back_n(Container const& cont, T const& v, Values const&... values) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::push_back_n(cont, v, values...)), diff --git a/sprout/operation/fit/push_front.hpp b/sprout/operation/fit/push_front.hpp index e6d412f5..e44cf64e 100644 --- a/sprout/operation/fit/push_front.hpp +++ b/sprout/operation/fit/push_front.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // push_front // @@ -26,17 +26,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::push_front::type + typename sprout::fixed::results::push_front::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // push_front // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::push_front::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::push_front::type push_front(Container const& cont, T const& v, Values const&... values) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::push_front(cont, v, values...)), diff --git a/sprout/operation/fit/push_front_n.hpp b/sprout/operation/fit/push_front_n.hpp index d15383ea..daa5c284 100644 --- a/sprout/operation/fit/push_front_n.hpp +++ b/sprout/operation/fit/push_front_n.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // push_front_n // @@ -26,17 +26,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::push_front_n::type + typename sprout::fixed::results::push_front_n::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // push_front_n // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::push_front_n::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::push_front_n::type push_front_n(Container const& cont, T const& v, Values const&... values) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::push_front_n(cont, v, values...)), diff --git a/sprout/operation/fit/realign.hpp b/sprout/operation/fit/realign.hpp index c9255c79..6fb52710 100644 --- a/sprout/operation/fit/realign.hpp +++ b/sprout/operation/fit/realign.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // realign // @@ -26,17 +26,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::realign::type + typename sprout::fixed::results::realign::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // realign // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::realign::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::realign::type realign(Container const& cont, T const& v) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::realign(cont, v)), @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::realign::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::realign::type realign(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::realign(cont)), diff --git a/sprout/operation/fit/realign_to.hpp b/sprout/operation/fit/realign_to.hpp index a6be3bb1..cb63d2dc 100644 --- a/sprout/operation/fit/realign_to.hpp +++ b/sprout/operation/fit/realign_to.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // realign_to // @@ -26,17 +26,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::realign_to::type + typename sprout::fixed::results::realign_to::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // realign_to // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::realign_to::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::realign_to::type realign_to(Container const& cont, T const& v) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::realign_to(cont, v)), @@ -45,7 +45,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::realign_to::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::realign_to::type realign_to(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::realign_to(cont)), diff --git a/sprout/operation/fit/resize.hpp b/sprout/operation/fit/resize.hpp index 2b72ae22..30762d8e 100644 --- a/sprout/operation/fit/resize.hpp +++ b/sprout/operation/fit/resize.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // resize // @@ -27,31 +27,31 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::resize::type + typename sprout::fixed::results::resize::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // resize // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::resize::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::resize::type resize(Container const& cont, T const& v) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::resize(cont, v)), 0, - sprout::container_traits::type>::static_size + sprout::container_traits::type>::static_size ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::resize::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::resize::type resize(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::resize(cont)), 0, - sprout::container_traits::type>::static_size + sprout::container_traits::type>::static_size ); } } // namespace fit diff --git a/sprout/operation/fit/resize_backward.hpp b/sprout/operation/fit/resize_backward.hpp index e6814561..1b596678 100644 --- a/sprout/operation/fit/resize_backward.hpp +++ b/sprout/operation/fit/resize_backward.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // resize_backward // @@ -27,31 +27,31 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::resize_backward::type + typename sprout::fixed::results::resize_backward::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // resize_backward // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::resize_backward::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::resize_backward::type resize_backward(Container const& cont, T const& v) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::resize_backward(cont, v)), 0, - sprout::container_traits::type>::static_size + sprout::container_traits::type>::static_size ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::resize_backward::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::resize_backward::type resize_backward(Container const& cont) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::resize_backward(cont)), 0, - sprout::container_traits::type>::static_size + sprout::container_traits::type>::static_size ); } } // namespace fit diff --git a/sprout/operation/fit/set.hpp b/sprout/operation/fit/set.hpp index 1bb180bc..a4afddaf 100644 --- a/sprout/operation/fit/set.hpp +++ b/sprout/operation/fit/set.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fit { - namespace result_of { + namespace results { // // set // @@ -27,17 +27,17 @@ namespace sprout { public: typedef sprout::sub_array< typename sprout::container_traits< - typename sprout::fixed::result_of::set::type + typename sprout::fixed::results::set::type >::internal_type > type; }; - } // namespace result_of + } // namespace results // // set // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::set::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::set::type set(Container const& cont, typename sprout::container_traits::const_iterator pos, T const& v) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::set(cont, pos, v)), @@ -46,7 +46,7 @@ namespace sprout { ); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::set::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::set::type set(Container const& cont, typename sprout::container_traits::difference_type pos, T const& v) { return sprout::sub_copy( sprout::get_internal(sprout::fixed::set(cont, pos, v)), diff --git a/sprout/operation/fixed/append.hpp b/sprout/operation/fixed/append.hpp index 670cdd02..d7880a5a 100644 --- a/sprout/operation/fixed/append.hpp +++ b/sprout/operation/fixed/append.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // append // @@ -29,7 +29,7 @@ namespace sprout { sprout::container_traits::static_size + sprout::container_traits::static_size > {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -60,30 +60,30 @@ namespace sprout { // append // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::append::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::append::type append( Container const& cont, typename sprout::container_traits::const_iterator pos, Input const& input ) { - return sprout::fixed::detail::append_impl::type>( + return sprout::fixed::detail::append_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), pos), sprout::size(input), input ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::append::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::append::type append( Container const& cont, typename sprout::container_traits::difference_type pos, Input const& input ) { - return sprout::fixed::detail::append_impl::type>( + return sprout::fixed::detail::append_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), sprout::next(sprout::begin(cont), pos)), sprout::size(input), input @@ -91,9 +91,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::append; - } // namespace result_of + namespace results { + using sprout::fixed::results::append; + } // namespace results using sprout::fixed::append; } // namespace sprout diff --git a/sprout/operation/fixed/append_back.hpp b/sprout/operation/fixed/append_back.hpp index 852960f5..479f95e4 100644 --- a/sprout/operation/fixed/append_back.hpp +++ b/sprout/operation/fixed/append_back.hpp @@ -18,25 +18,25 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // append_back // template struct append_back - : public sprout::fixed::result_of::append + : public sprout::fixed::results::append {}; - } // namespace result_of + } // namespace results // // append_back // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::append_back::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::append_back::type append_back(Container const& cont, Input const& input) { - return sprout::fixed::detail::append_impl::type>( + return sprout::fixed::detail::append_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_end_offset(cont), sprout::size(input), input @@ -44,9 +44,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::append_back; - } // namespace result_of + namespace results { + using sprout::fixed::results::append_back; + } // namespace results using sprout::fixed::append_back; } // namespace sprout diff --git a/sprout/operation/fixed/append_front.hpp b/sprout/operation/fixed/append_front.hpp index 77891a93..70fd12fa 100644 --- a/sprout/operation/fixed/append_front.hpp +++ b/sprout/operation/fixed/append_front.hpp @@ -18,25 +18,25 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // append_front // template struct append_front - : public sprout::fixed::result_of::append + : public sprout::fixed::results::append {}; - } // namespace result_of + } // namespace results // // append_front // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::append_front::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::append_front::type append_front(Container const& cont, Input const& input) { - return sprout::fixed::detail::append_impl::type>( + return sprout::fixed::detail::append_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_begin_offset(cont), sprout::size(input), input @@ -44,9 +44,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::append_front; - } // namespace result_of + namespace results { + using sprout::fixed::results::append_front; + } // namespace results using sprout::fixed::append_front; } // namespace sprout diff --git a/sprout/operation/fixed/erase.hpp b/sprout/operation/fixed/erase.hpp index 11defd16..1f7f674b 100644 --- a/sprout/operation/fixed/erase.hpp +++ b/sprout/operation/fixed/erase.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // erase // @@ -31,7 +31,7 @@ namespace sprout { { static_assert(sprout::container_traits::static_size >= 1, "static_size >= 1"); }; - } // namespace result_of + } // namespace results namespace detail { template @@ -58,11 +58,11 @@ namespace sprout { // erase // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::erase::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::erase::type erase(Container const& cont, typename sprout::container_traits::const_iterator pos) { - return sprout::fixed::detail::erase_impl::type>( + return sprout::fixed::detail::erase_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), pos) ); } @@ -70,19 +70,19 @@ namespace sprout { // erase // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::erase::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::erase::type erase(Container const& cont, typename sprout::container_traits::difference_type pos) { - return sprout::fixed::detail::erase_impl::type>( + return sprout::fixed::detail::erase_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), sprout::next(sprout::begin(cont), pos)) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::erase; - } // namespace result_of + namespace results { + using sprout::fixed::results::erase; + } // namespace results using sprout::fixed::erase; } // namespace sprout diff --git a/sprout/operation/fixed/erase_n.hpp b/sprout/operation/fixed/erase_n.hpp index a56db978..b66f46fa 100644 --- a/sprout/operation/fixed/erase_n.hpp +++ b/sprout/operation/fixed/erase_n.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // erase_n // @@ -32,7 +32,7 @@ namespace sprout { { static_assert(sprout::container_traits::static_size >= N, "static_size >= N"); }; - } // namespace result_of + } // namespace results namespace detail { template @@ -59,28 +59,28 @@ namespace sprout { // erase_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::erase_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::erase_n::type erase_n(Container const& cont, typename sprout::container_traits::const_iterator pos) { - return sprout::fixed::detail::erase_n_impl::type>( + return sprout::fixed::detail::erase_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), pos) ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::erase_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::erase_n::type erase_n(Container const& cont, typename sprout::container_traits::difference_type pos) { - return sprout::fixed::detail::erase_n_impl::type>( + return sprout::fixed::detail::erase_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), sprout::next(sprout::begin(cont), pos)) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::erase_n; - } // namespace result_of + namespace results { + using sprout::fixed::results::erase_n; + } // namespace results using sprout::fixed::erase_n; } // namespace sprout diff --git a/sprout/operation/fixed/insert.hpp b/sprout/operation/fixed/insert.hpp index 90f1aab0..b5f259b5 100644 --- a/sprout/operation/fixed/insert.hpp +++ b/sprout/operation/fixed/insert.hpp @@ -19,7 +19,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // insert // @@ -31,7 +31,7 @@ namespace sprout { sprout::container_traits::static_size + 1 + sizeof...(Values) > {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -60,30 +60,30 @@ namespace sprout { // insert // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::insert::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::insert::type insert( Container const& cont, typename sprout::container_traits::const_iterator pos, T const& v, Values const&... values ) { - return sprout::fixed::detail::insert_impl::type>( + return sprout::fixed::detail::insert_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), pos), v, values... ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::insert::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::insert::type insert( Container const& cont, typename sprout::container_traits::difference_type pos, T const& v, Values const&... values ) { - return sprout::fixed::detail::insert_impl::type>( + return sprout::fixed::detail::insert_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), sprout::next(sprout::begin(cont), pos)), v, values... @@ -91,9 +91,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::insert; - } // namespace result_of + namespace results { + using sprout::fixed::results::insert; + } // namespace results using sprout::fixed::insert; } // namespace sprout diff --git a/sprout/operation/fixed/insert_n.hpp b/sprout/operation/fixed/insert_n.hpp index 53f803eb..ea743935 100644 --- a/sprout/operation/fixed/insert_n.hpp +++ b/sprout/operation/fixed/insert_n.hpp @@ -21,7 +21,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // insert_n // @@ -33,7 +33,7 @@ namespace sprout { sprout::container_traits::static_size + (1 + sizeof...(Values)) * N > {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -63,15 +63,15 @@ namespace sprout { // insert_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::insert_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::insert_n::type insert_n( Container const& cont, typename sprout::container_traits::const_iterator pos, T const& v, Values const&... values ) { - return sprout::fixed::detail::insert_n_impl::type>( + return sprout::fixed::detail::insert_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), pos), v, values... @@ -81,15 +81,15 @@ namespace sprout { // insert_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::insert_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::insert_n::type insert_n( Container const& cont, typename sprout::container_traits::difference_type pos, T const& v, Values const&... values ) { - return sprout::fixed::detail::insert_n_impl::type>( + return sprout::fixed::detail::insert_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), sprout::next(sprout::begin(cont), pos)), v, values... @@ -97,9 +97,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::insert_n; - } // namespace result_of + namespace results { + using sprout::fixed::results::insert_n; + } // namespace results using sprout::fixed::insert_n; } // namespace sprout diff --git a/sprout/operation/fixed/pop_back.hpp b/sprout/operation/fixed/pop_back.hpp index 42a64947..e54bb049 100644 --- a/sprout/operation/fixed/pop_back.hpp +++ b/sprout/operation/fixed/pop_back.hpp @@ -18,33 +18,33 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // pop_back // template struct pop_back - : public sprout::fixed::result_of::erase + : public sprout::fixed::results::erase {}; - } // namespace result_of + } // namespace results // // pop_back // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::pop_back::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::pop_back::type pop_back(Container const& cont) { - return sprout::fixed::detail::erase_impl::type>( + return sprout::fixed::detail::erase_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_end_offset(cont) - 1 ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::pop_back; - } // namespace result_of + namespace results { + using sprout::fixed::results::pop_back; + } // namespace results using sprout::fixed::pop_back; } // namespace sprout diff --git a/sprout/operation/fixed/pop_back_n.hpp b/sprout/operation/fixed/pop_back_n.hpp index 61967748..77e2cd24 100644 --- a/sprout/operation/fixed/pop_back_n.hpp +++ b/sprout/operation/fixed/pop_back_n.hpp @@ -18,33 +18,33 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // pop_back_n // template struct pop_back_n - : public sprout::fixed::result_of::erase_n + : public sprout::fixed::results::erase_n {}; - } // namespace result_of + } // namespace results // // pop_back_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::pop_back_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::pop_back_n::type pop_back_n(Container const& cont) { - return sprout::fixed::detail::erase_n_impl::type>( + return sprout::fixed::detail::erase_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_end_offset(cont) - N ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::pop_back_n; - } // namespace result_of + namespace results { + using sprout::fixed::results::pop_back_n; + } // namespace results using sprout::fixed::pop_back_n; } // namespace sprout diff --git a/sprout/operation/fixed/pop_front.hpp b/sprout/operation/fixed/pop_front.hpp index 96eccb56..c847b761 100644 --- a/sprout/operation/fixed/pop_front.hpp +++ b/sprout/operation/fixed/pop_front.hpp @@ -18,33 +18,33 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // pop_front // template struct pop_front - : public sprout::fixed::result_of::erase + : public sprout::fixed::results::erase {}; - } // namespace result_of + } // namespace results // // pop_front // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::pop_front::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::pop_front::type pop_front(Container const& cont) { - return sprout::fixed::detail::erase_impl::type>( + return sprout::fixed::detail::erase_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_begin_offset(cont) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::pop_front; - } // namespace result_of + namespace results { + using sprout::fixed::results::pop_front; + } // namespace results using sprout::fixed::pop_front; } // namespace sprout diff --git a/sprout/operation/fixed/pop_front_n.hpp b/sprout/operation/fixed/pop_front_n.hpp index 59b1f4e4..0c702403 100644 --- a/sprout/operation/fixed/pop_front_n.hpp +++ b/sprout/operation/fixed/pop_front_n.hpp @@ -18,33 +18,33 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // pop_front_n // template struct pop_front_n - : public sprout::fixed::result_of::erase_n + : public sprout::fixed::results::erase_n {}; - } // namespace result_of + } // namespace results // // pop_front_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::pop_front_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::pop_front_n::type pop_front_n(Container const& cont) { - return sprout::fixed::detail::erase_n_impl::type>( + return sprout::fixed::detail::erase_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_begin_offset(cont) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::pop_front_n; - } // namespace result_of + namespace results { + using sprout::fixed::results::pop_front_n; + } // namespace results using sprout::fixed::pop_front_n; } // namespace sprout diff --git a/sprout/operation/fixed/push_back.hpp b/sprout/operation/fixed/push_back.hpp index 45f2edc9..e7abe4fb 100644 --- a/sprout/operation/fixed/push_back.hpp +++ b/sprout/operation/fixed/push_back.hpp @@ -18,25 +18,25 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // push_back // template struct push_back - : public sprout::fixed::result_of::insert + : public sprout::fixed::results::insert {}; - } // namespace result_of + } // namespace results // // push_back // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::push_back::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::push_back::type push_back(Container const& cont, T const& v, Values const&... values) { - return sprout::fixed::detail::insert_impl::type>( + return sprout::fixed::detail::insert_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_end_offset(cont), v, values... @@ -44,9 +44,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::push_back; - } // namespace result_of + namespace results { + using sprout::fixed::results::push_back; + } // namespace results using sprout::fixed::push_back; } // namespace sprout diff --git a/sprout/operation/fixed/push_back_n.hpp b/sprout/operation/fixed/push_back_n.hpp index 56ee4207..4aba4c78 100644 --- a/sprout/operation/fixed/push_back_n.hpp +++ b/sprout/operation/fixed/push_back_n.hpp @@ -18,25 +18,25 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // push_back_n // template struct push_back_n - : public sprout::fixed::result_of::insert_n + : public sprout::fixed::results::insert_n {}; - } // namespace result_of + } // namespace results // // push_back_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::push_back_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::push_back_n::type push_back_n(Container const& cont, T const& v, Values const&... values) { - return sprout::fixed::detail::insert_n_impl::type>( + return sprout::fixed::detail::insert_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_end_offset(cont), v, values... @@ -44,9 +44,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::push_back_n; - } // namespace result_of + namespace results { + using sprout::fixed::results::push_back_n; + } // namespace results using sprout::fixed::push_back_n; } // namespace sprout diff --git a/sprout/operation/fixed/push_front.hpp b/sprout/operation/fixed/push_front.hpp index 25df3578..7a673909 100644 --- a/sprout/operation/fixed/push_front.hpp +++ b/sprout/operation/fixed/push_front.hpp @@ -18,25 +18,25 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // push_front // template struct push_front - : public sprout::fixed::result_of::insert + : public sprout::fixed::results::insert {}; - } // namespace result_of + } // namespace results // // push_front // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::push_front::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::push_front::type push_front(Container const& cont, T const& v, Values const&... values) { - return sprout::fixed::detail::insert_impl::type>( + return sprout::fixed::detail::insert_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_begin_offset(cont), v, values... @@ -44,9 +44,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::push_front; - } // namespace result_of + namespace results { + using sprout::fixed::results::push_front; + } // namespace results using sprout::fixed::push_front; } // namespace sprout diff --git a/sprout/operation/fixed/push_front_n.hpp b/sprout/operation/fixed/push_front_n.hpp index c10fe85c..a1a6bb35 100644 --- a/sprout/operation/fixed/push_front_n.hpp +++ b/sprout/operation/fixed/push_front_n.hpp @@ -18,25 +18,25 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // push_front_n // template struct push_front_n - : public sprout::fixed::result_of::insert_n + : public sprout::fixed::results::insert_n {}; - } // namespace result_of + } // namespace results // // push_front_n // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::push_front_n::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::push_front_n::type push_front_n(Container const& cont, T const& v, Values const&... values) { - return sprout::fixed::detail::insert_n_impl::type>( + return sprout::fixed::detail::insert_n_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::internal_begin_offset(cont), v, values... @@ -44,9 +44,9 @@ namespace sprout { } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::push_front_n; - } // namespace result_of + namespace results { + using sprout::fixed::results::push_front_n; + } // namespace results using sprout::fixed::push_front_n; } // namespace sprout diff --git a/sprout/operation/fixed/realign.hpp b/sprout/operation/fixed/realign.hpp index e64c3b3c..1c52d709 100644 --- a/sprout/operation/fixed/realign.hpp +++ b/sprout/operation/fixed/realign.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // realign // @@ -26,7 +26,7 @@ namespace sprout { public: typedef typename sprout::container_construct_traits::copied_type type; }; - } // namespace result_of + } // namespace results namespace detail { template @@ -48,11 +48,11 @@ namespace sprout { // realign // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::realign::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::realign::type realign(Container const& cont, T const& v) { - return sprout::fixed::detail::realign_impl::type>( + return sprout::fixed::detail::realign_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont), v ); @@ -78,19 +78,19 @@ namespace sprout { // realign // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::realign::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::realign::type realign(Container const& cont) { - return sprout::fixed::detail::realign_impl::type>( + return sprout::fixed::detail::realign_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::realign; - } // namespace result_of + namespace results { + using sprout::fixed::results::realign; + } // namespace results using sprout::fixed::realign; } // namespace sprout diff --git a/sprout/operation/fixed/realign_to.hpp b/sprout/operation/fixed/realign_to.hpp index 30aa298c..d5217331 100644 --- a/sprout/operation/fixed/realign_to.hpp +++ b/sprout/operation/fixed/realign_to.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // realign_to // @@ -27,17 +27,17 @@ namespace sprout { public: typedef typename sprout::container_construct_traits::copied_type type; }; - } // namespace result_of + } // namespace results // // realign_to // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::realign_to::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::realign_to::type realign_to(Container const& cont, T const& v) { - return sprout::fixed::detail::realign_impl::type>( + return sprout::fixed::detail::realign_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont), v ); @@ -47,19 +47,19 @@ namespace sprout { // realign_to // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::realign_to::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::realign_to::type realign_to(Container const& cont) { - return sprout::fixed::detail::realign_impl::type>( + return sprout::fixed::detail::realign_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::realign_to; - } // namespace result_of + namespace results { + using sprout::fixed::results::realign_to; + } // namespace results using sprout::fixed::realign_to; } // namespace sprout diff --git a/sprout/operation/fixed/resize.hpp b/sprout/operation/fixed/resize.hpp index 627ec371..504c2a92 100644 --- a/sprout/operation/fixed/resize.hpp +++ b/sprout/operation/fixed/resize.hpp @@ -18,7 +18,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // resize // @@ -30,7 +30,7 @@ namespace sprout { N > {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -52,11 +52,11 @@ namespace sprout { // resize // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::resize::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::resize::type resize(Container const& cont, T const& v) { - return sprout::fixed::detail::resize_impl::type>( + return sprout::fixed::detail::resize_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont), v ); @@ -82,19 +82,19 @@ namespace sprout { // resize // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::resize::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::resize::type resize(Container const& cont) { - return sprout::fixed::detail::resize_impl::type>( + return sprout::fixed::detail::resize_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::resize; - } // namespace result_of + namespace results { + using sprout::fixed::results::resize; + } // namespace results using sprout::fixed::resize; } // namespace sprout diff --git a/sprout/operation/fixed/resize_backward.hpp b/sprout/operation/fixed/resize_backward.hpp index 177908ae..c6232ac7 100644 --- a/sprout/operation/fixed/resize_backward.hpp +++ b/sprout/operation/fixed/resize_backward.hpp @@ -19,15 +19,15 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // resize_backward // template struct resize_backward - : public sprout::fixed::result_of::resize + : public sprout::fixed::results::resize {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -51,14 +51,14 @@ namespace sprout { // resize_backward // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::resize_backward::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::resize_backward::type resize_backward(Container const& cont, T const& v) { - return sprout::fixed::detail::resize_backward_impl::type>( + return sprout::fixed::detail::resize_backward_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont), static_cast::difference_type>( - sprout::container_traits::type>::static_size + sprout::container_traits::type>::static_size ) - sprout::size(cont), v @@ -86,23 +86,23 @@ namespace sprout { // resize_backward // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::resize_backward::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::resize_backward::type resize_backward(Container const& cont) { - return sprout::fixed::detail::resize_backward_impl::type>( + return sprout::fixed::detail::resize_backward_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::size(cont), static_cast::difference_type>( - sprout::container_traits::type>::static_size + sprout::container_traits::type>::static_size ) - sprout::size(cont) ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::resize_backward; - } // namespace result_of + namespace results { + using sprout::fixed::results::resize_backward; + } // namespace results using sprout::fixed::resize_backward; } // namespace sprout diff --git a/sprout/operation/fixed/set.hpp b/sprout/operation/fixed/set.hpp index b9f5e61a..ac693d9a 100644 --- a/sprout/operation/fixed/set.hpp +++ b/sprout/operation/fixed/set.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace fixed { - namespace result_of { + namespace results { // // set // @@ -26,7 +26,7 @@ namespace sprout { public: typedef typename sprout::container_construct_traits::copied_type type; }; - } // namespace result_of + } // namespace results namespace detail { template @@ -50,30 +50,30 @@ namespace sprout { // set // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::set::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::set::type set(Container const& cont, typename sprout::container_traits::const_iterator pos, T const& v) { - return sprout::fixed::detail::set_impl::type>( + return sprout::fixed::detail::set_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), pos), v ); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::set::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::set::type set(Container const& cont, typename sprout::container_traits::difference_type pos, T const& v) { - return sprout::fixed::detail::set_impl::type>( + return sprout::fixed::detail::set_impl::type>( cont, - sprout::container_indexes::type>::make(), + sprout::container_indexes::type>::make(), sprout::distance(sprout::internal_begin(cont), sprout::next(sprout::begin(cont), pos)), v ); } } // namespace fixed - namespace result_of { - using sprout::fixed::result_of::set; - } // namespace result_of + namespace results { + using sprout::fixed::results::set; + } // namespace results using sprout::fixed::set; } // namespace sprout diff --git a/sprout/optional/optional.hpp b/sprout/optional/optional.hpp index 4d4177b5..bef97967 100644 --- a/sprout/optional/optional.hpp +++ b/sprout/optional/optional.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -105,7 +106,7 @@ namespace sprout { : init(v.init) , val(v.is_initialized() ? holder_type(*v) : holder_type()) {} -#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1)) +#if SPROUT_GCC_BETWEEN(4, 8, 0, 4, 8, 2) optional(optional&&) = default; #else SPROUT_CONSTEXPR optional(optional&& v) diff --git a/sprout/random/seed_array.hpp b/sprout/random/seed_array.hpp index f44113a9..dc1fd402 100644 --- a/sprout/random/seed_array.hpp +++ b/sprout/random/seed_array.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -90,7 +90,7 @@ namespace sprout { ; } template - static SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type set2_impl( + static SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set2_impl( Result const& result, size_type kpn, size_type kqn, size_type kn, typename sprout::container_traits::value_type r3, @@ -110,7 +110,7 @@ namespace sprout { ); } template - static SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type set2( + static SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set2( Result const& result, size_type kpn, size_type kqn, size_type kn, typename sprout::container_traits::value_type r3, @@ -120,7 +120,7 @@ namespace sprout { return set2_impl(result, kpn, kqn, kn, r3, r3 - r4_3, sprout::container_indexes::make()); } template - static SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type set1_impl( + static SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set1_impl( Result const& result, size_type kpn, size_type kqn, size_type kn, typename sprout::container_traits::value_type r1, @@ -140,7 +140,7 @@ namespace sprout { ); } template - static SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type set1( + static SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set1( Result const& result, size_type kpn, size_type kqn, size_type kn, typename sprout::container_traits::value_type r1, @@ -150,7 +150,7 @@ namespace sprout { return set1_impl(result, kpn, kqn, kn, r1, r1 + r2_1, sprout::container_indexes::make()); } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type gen2( + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type gen2( Result const& result, size_type n, size_type s, size_type m, size_type t, size_type p, size_type q, size_type k @@ -169,7 +169,7 @@ namespace sprout { ; } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type gen1_2( + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type gen1_2( Result const& result, size_type n, size_type s, size_type m, size_type t, size_type p, size_type q, size_type k @@ -188,7 +188,7 @@ namespace sprout { ; } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type gen1_1( + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type gen1_1( Result const& result, size_type n, size_type s, size_type m, size_type t, size_type p, size_type q, size_type k @@ -207,7 +207,7 @@ namespace sprout { ; } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type gen1_0( + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type gen1_0( Result const& result, size_type n, size_type s, size_type p, size_type q ) const @@ -219,7 +219,7 @@ namespace sprout { ); } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type gen_impl( + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type gen_impl( Result const& result, size_type n, size_type s, size_type m, size_type t, size_type p, size_type q ) const @@ -242,7 +242,7 @@ namespace sprout { ); } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type gen( + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type gen( Result const& result, TempResult const& temp_result, size_type n, size_type s, size_type m, size_type t ) const @@ -310,7 +310,7 @@ namespace sprout { } } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type generate(Result const& result) const { + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate(Result const& result) const { typedef typename sprout::container_traits::value_type value_type; typedef sprout::array::static_size> temp_type; return !sprout::empty(result) ? gen( @@ -322,7 +322,7 @@ namespace sprout { ; } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type generate() const { + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type generate() const { return generate(sprout::pit()); } SPROUT_CONSTEXPR size_type size() const SPROUT_NOEXCEPT { @@ -342,11 +342,11 @@ namespace sprout { typename Result, typename sprout::enabler_if::value>::type = sprout::enabler > - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type param(Result const& result) const { + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type param(Result const& result) const { return sprout::fixed::copy(v.begin(), v.end(), result); } template - SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type param() const { + SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type param() const { return sprout::fixed::copy(v.begin(), v.end()); } }; diff --git a/sprout/range/adaptor/copied.hpp b/sprout/range/adaptor/copied.hpp index ca222163..57fb03f6 100644 --- a/sprout/range/adaptor/copied.hpp +++ b/sprout/range/adaptor/copied.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -90,7 +90,7 @@ namespace sprout { // operator| // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type operator|(Range&& lhs, sprout::adaptors::copy_holder const& rhs) { return sprout::range::fixed::copy(sprout::lvalue_forward(lhs), rhs.result()); } diff --git a/sprout/range/algorithm/fit/clamp_range_copy.hpp b/sprout/range/algorithm/fit/clamp_range_copy.hpp index 557416ba..394da4a1 100644 --- a/sprout/range/algorithm/fit/clamp_range_copy.hpp +++ b/sprout/range/algorithm/fit/clamp_range_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // clamp_range_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_copy( InputRange const& rng, Result const& result, typename sprout::container_traits::value_type const& low, @@ -32,7 +32,7 @@ namespace sprout { return sprout::fit::clamp_range_copy(sprout::begin(rng), sprout::end(rng), result, low, high, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type clamp_range_copy( InputRange const& rng, Result const& result, typename sprout::container_traits::value_type const& low, diff --git a/sprout/range/algorithm/fit/copy.hpp b/sprout/range/algorithm/fit/copy.hpp index bc07e7d1..bfd831b2 100644 --- a/sprout/range/algorithm/fit/copy.hpp +++ b/sprout/range/algorithm/fit/copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy(InputRange const& rng, Result const& result) { return sprout::fit::copy(sprout::begin(rng), sprout::end(rng), result); } diff --git a/sprout/range/algorithm/fit/copy_backward.hpp b/sprout/range/algorithm/fit/copy_backward.hpp index bcaa36c2..319c720b 100644 --- a/sprout/range/algorithm/fit/copy_backward.hpp +++ b/sprout/range/algorithm/fit/copy_backward.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // copy_backward // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_backward(BidirectionalRange const& rng, Result const& result) { return sprout::fit::copy_backward(sprout::begin(rng), sprout::end(rng), result); } diff --git a/sprout/range/algorithm/fit/copy_if.hpp b/sprout/range/algorithm/fit/copy_if.hpp index 5f9e7ea0..57ce56ef 100644 --- a/sprout/range/algorithm/fit/copy_if.hpp +++ b/sprout/range/algorithm/fit/copy_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_if(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fit::copy_if(sprout::begin(rng), sprout::end(rng), result, pred); } diff --git a/sprout/range/algorithm/fit/copy_until.hpp b/sprout/range/algorithm/fit/copy_until.hpp index f1fd1297..1a3ba6eb 100644 --- a/sprout/range/algorithm/fit/copy_until.hpp +++ b/sprout/range/algorithm/fit/copy_until.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // copy_until // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_until(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fit::copy_until(sprout::begin(rng), sprout::end(rng), result, pred); } diff --git a/sprout/range/algorithm/fit/copy_while.hpp b/sprout/range/algorithm/fit/copy_while.hpp index b7cd628b..12b96df2 100644 --- a/sprout/range/algorithm/fit/copy_while.hpp +++ b/sprout/range/algorithm/fit/copy_while.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // copy_while // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type copy_while(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fit::copy_while(sprout::begin(rng), sprout::end(rng), result, pred); } diff --git a/sprout/range/algorithm/fit/merge.hpp b/sprout/range/algorithm/fit/merge.hpp index 0aeb1591..d9559375 100644 --- a/sprout/range/algorithm/fit/merge.hpp +++ b/sprout/range/algorithm/fit/merge.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,12 +20,12 @@ namespace sprout { // merge // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fit::merge(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fit::merge(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } diff --git a/sprout/range/algorithm/fit/partition_copy.hpp b/sprout/range/algorithm/fit/partition_copy.hpp index 1fed2e31..1ba1101f 100644 --- a/sprout/range/algorithm/fit/partition_copy.hpp +++ b/sprout/range/algorithm/fit/partition_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partition_copy(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fit::partition_copy(sprout::begin(rng), sprout::end(rng), result, pred); } diff --git a/sprout/range/algorithm/fit/remove_copy.hpp b/sprout/range/algorithm/fit/remove_copy.hpp index 9e0e6fd1..876f1dc0 100644 --- a/sprout/range/algorithm/fit/remove_copy.hpp +++ b/sprout/range/algorithm/fit/remove_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // remove_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_copy(InputRange const& rng, Result const& result, T const& value) { return sprout::fit::remove_copy(sprout::begin(rng), sprout::end(rng), result, value); } diff --git a/sprout/range/algorithm/fit/remove_copy_if.hpp b/sprout/range/algorithm/fit/remove_copy_if.hpp index 1c7ce5b0..df15bb3a 100644 --- a/sprout/range/algorithm/fit/remove_copy_if.hpp +++ b/sprout/range/algorithm/fit/remove_copy_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // remove_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type remove_copy_if(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fit::remove_copy_if(sprout::begin(rng), sprout::end(rng), result, pred); } diff --git a/sprout/range/algorithm/fit/replace_copy.hpp b/sprout/range/algorithm/fit/replace_copy.hpp index ad5a38b5..094534cb 100644 --- a/sprout/range/algorithm/fit/replace_copy.hpp +++ b/sprout/range/algorithm/fit/replace_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // replace_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_copy(InputRange const& rng, Result const& result, T const& old_value, T const& new_value) { return sprout::fit::replace_copy(sprout::begin(rng), sprout::end(rng), result, old_value, new_value); } diff --git a/sprout/range/algorithm/fit/replace_copy_if.hpp b/sprout/range/algorithm/fit/replace_copy_if.hpp index ec595c38..edad213e 100644 --- a/sprout/range/algorithm/fit/replace_copy_if.hpp +++ b/sprout/range/algorithm/fit/replace_copy_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // replace_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type replace_copy_if(InputRange const& rng, Result const& result, Predicate pred, T const& new_value) { return sprout::fit::replace_copy_if(sprout::begin(rng), sprout::end(rng), result, pred, new_value); } diff --git a/sprout/range/algorithm/fit/reverse_copy.hpp b/sprout/range/algorithm/fit/reverse_copy.hpp index 0c8f5c7c..c66a3430 100644 --- a/sprout/range/algorithm/fit/reverse_copy.hpp +++ b/sprout/range/algorithm/fit/reverse_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // reverse_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type reverse_copy(BidirectionalRange const& rng, Result const& result) { return sprout::fit::reverse_copy(sprout::begin(rng), sprout::end(rng), result); } diff --git a/sprout/range/algorithm/fit/rotate_copy.hpp b/sprout/range/algorithm/fit/rotate_copy.hpp index 29ab23e2..6735f823 100644 --- a/sprout/range/algorithm/fit/rotate_copy.hpp +++ b/sprout/range/algorithm/fit/rotate_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // rotate_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type rotate_copy( ForwardRange const& rng, typename sprout::container_traits::const_iterator middle, Result const& result diff --git a/sprout/range/algorithm/fit/set_difference.hpp b/sprout/range/algorithm/fit/set_difference.hpp index 7f245352..e5e20824 100644 --- a/sprout/range/algorithm/fit/set_difference.hpp +++ b/sprout/range/algorithm/fit/set_difference.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,12 +20,12 @@ namespace sprout { // set_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fit::set_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fit::set_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } diff --git a/sprout/range/algorithm/fit/set_intersection.hpp b/sprout/range/algorithm/fit/set_intersection.hpp index 60eb2ef0..644fa725 100644 --- a/sprout/range/algorithm/fit/set_intersection.hpp +++ b/sprout/range/algorithm/fit/set_intersection.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,12 +20,12 @@ namespace sprout { // set_intersection // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fit::set_intersection(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fit::set_intersection(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } diff --git a/sprout/range/algorithm/fit/set_symmetric_difference.hpp b/sprout/range/algorithm/fit/set_symmetric_difference.hpp index 387ffe11..4f576dad 100644 --- a/sprout/range/algorithm/fit/set_symmetric_difference.hpp +++ b/sprout/range/algorithm/fit/set_symmetric_difference.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,12 +20,12 @@ namespace sprout { // set_symmetric_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fit::set_symmetric_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fit::set_symmetric_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } diff --git a/sprout/range/algorithm/fit/set_union.hpp b/sprout/range/algorithm/fit/set_union.hpp index 2d3bd864..dde45168 100644 --- a/sprout/range/algorithm/fit/set_union.hpp +++ b/sprout/range/algorithm/fit/set_union.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,12 +20,12 @@ namespace sprout { // set_union // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fit::set_union(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fit::set_union(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } diff --git a/sprout/range/algorithm/fit/stable_partition_copy.hpp b/sprout/range/algorithm/fit/stable_partition_copy.hpp index fd76b22e..18335ab9 100644 --- a/sprout/range/algorithm/fit/stable_partition_copy.hpp +++ b/sprout/range/algorithm/fit/stable_partition_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // stable_partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type stable_partition_copy(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fit::stable_partition_copy(sprout::begin(rng), sprout::end(rng), result, pred); } diff --git a/sprout/range/algorithm/fit/swap_element_copy.hpp b/sprout/range/algorithm/fit/swap_element_copy.hpp index 4f762123..3cb5e345 100644 --- a/sprout/range/algorithm/fit/swap_element_copy.hpp +++ b/sprout/range/algorithm/fit/swap_element_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // swap_element_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type swap_element_copy( ForwardRange const& rng, Result const& result, typename sprout::container_traits::const_iterator pos1, diff --git a/sprout/range/algorithm/fit/transform.hpp b/sprout/range/algorithm/fit/transform.hpp index 3ff4897d..fc14e6b8 100644 --- a/sprout/range/algorithm/fit/transform.hpp +++ b/sprout/range/algorithm/fit/transform.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,12 +20,12 @@ namespace sprout { // transform // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputRange const& rng, Result const& result, UnaryOperation op) { return sprout::fit::transform(sprout::begin(rng), sprout::end(rng), result, op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, BinaryOperation op) { return sprout::fit::transform(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), result, op); } diff --git a/sprout/range/algorithm/fit/unique_copy.hpp b/sprout/range/algorithm/fit/unique_copy.hpp index 38145b66..eaca1dc4 100644 --- a/sprout/range/algorithm/fit/unique_copy.hpp +++ b/sprout/range/algorithm/fit/unique_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,12 +20,12 @@ namespace sprout { // unique_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_copy(InputRange const& rng, Result const& result) { return sprout::fit::unique_copy(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type unique_copy(InputRange const& rng, Result const& result, BinaryPredicate pred) { return sprout::fit::unique_copy(sprout::begin(rng), sprout::end(rng), result, pred); } diff --git a/sprout/range/algorithm/fixed/clamp_range_copy.hpp b/sprout/range/algorithm/fixed/clamp_range_copy.hpp index 214795de..061a9d4c 100644 --- a/sprout/range/algorithm/fixed/clamp_range_copy.hpp +++ b/sprout/range/algorithm/fixed/clamp_range_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // clamp_range_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputRange const& rng, Result const& result, typename sprout::container_traits::value_type const& low, @@ -32,7 +32,7 @@ namespace sprout { return sprout::fixed::clamp_range_copy(sprout::begin(rng), sprout::end(rng), result, low, high, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputRange const& rng, Result const& result, typename sprout::container_traits::value_type const& low, @@ -43,7 +43,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputRange const& rng, typename sprout::container_traits::value_type const& low, @@ -54,7 +54,7 @@ namespace sprout { return sprout::fixed::clamp_range_copy(sprout::begin(rng), sprout::end(rng), low, high, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type clamp_range_copy( InputRange const& rng, typename sprout::container_traits::value_type const& low, diff --git a/sprout/range/algorithm/fixed/copy.hpp b/sprout/range/algorithm/fixed/copy.hpp index 822672cd..50558ec6 100644 --- a/sprout/range/algorithm/fixed/copy.hpp +++ b/sprout/range/algorithm/fixed/copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy(InputRange const& rng, Result const& result) { return sprout::fixed::copy(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy(InputRange const& rng) { return sprout::fixed::copy(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/algorithm/fixed/copy_backward.hpp b/sprout/range/algorithm/fixed/copy_backward.hpp index 222a70d0..1b2d2f31 100644 --- a/sprout/range/algorithm/fixed/copy_backward.hpp +++ b/sprout/range/algorithm/fixed/copy_backward.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // copy_backward // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward(BidirectionalRange const& rng, Result const& result) { return sprout::fixed::copy_backward(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_backward(BidirectionalRange const& rng) { return sprout::fixed::copy_backward(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/algorithm/fixed/copy_if.hpp b/sprout/range/algorithm/fixed/copy_if.hpp index 4b92bc6a..3c177c87 100644 --- a/sprout/range/algorithm/fixed/copy_if.hpp +++ b/sprout/range/algorithm/fixed/copy_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_if(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fixed::copy_if(sprout::begin(rng), sprout::end(rng), result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_if(InputRange const& rng, Predicate pred) { return sprout::fixed::copy_if(sprout::begin(rng), sprout::end(rng), pred); } diff --git a/sprout/range/algorithm/fixed/copy_until.hpp b/sprout/range/algorithm/fixed/copy_until.hpp index 96a51e9a..624c9246 100644 --- a/sprout/range/algorithm/fixed/copy_until.hpp +++ b/sprout/range/algorithm/fixed/copy_until.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // copy_until // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_until(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fixed::copy_until(sprout::begin(rng), sprout::end(rng), result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_until(InputRange const& rng, Predicate pred) { return sprout::fixed::copy_until(sprout::begin(rng), sprout::end(rng), pred); } diff --git a/sprout/range/algorithm/fixed/copy_while.hpp b/sprout/range/algorithm/fixed/copy_while.hpp index 737fb01f..391043de 100644 --- a/sprout/range/algorithm/fixed/copy_while.hpp +++ b/sprout/range/algorithm/fixed/copy_while.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // copy_while // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_while(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fixed::copy_while(sprout::begin(rng), sprout::end(rng), result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type copy_while(InputRange const& rng, Predicate pred) { return sprout::fixed::copy_while(sprout::begin(rng), sprout::end(rng), pred); } diff --git a/sprout/range/algorithm/fixed/merge.hpp b/sprout/range/algorithm/fixed/merge.hpp index 7790163b..64548ae5 100644 --- a/sprout/range/algorithm/fixed/merge.hpp +++ b/sprout/range/algorithm/fixed/merge.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,23 +20,23 @@ namespace sprout { // merge // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fixed::merge(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fixed::merge(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge(InputRange1 const& rng1, InputRange2 const& rng2, Compare comp) { return sprout::fixed::merge(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type merge(InputRange1 const& rng1, InputRange2 const& rng2) { return sprout::fixed::merge(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2)); } diff --git a/sprout/range/algorithm/fixed/partition_copy.hpp b/sprout/range/algorithm/fixed/partition_copy.hpp index fe75feef..3ef8e927 100644 --- a/sprout/range/algorithm/fixed/partition_copy.hpp +++ b/sprout/range/algorithm/fixed/partition_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partition_copy(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fixed::partition_copy(sprout::begin(rng), sprout::end(rng), result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partition_copy(InputRange const& rng, Predicate pred) { return sprout::fixed::partition_copy(sprout::begin(rng), sprout::end(rng), pred); } diff --git a/sprout/range/algorithm/fixed/remove_copy.hpp b/sprout/range/algorithm/fixed/remove_copy.hpp index 1bcfd578..40496159 100644 --- a/sprout/range/algorithm/fixed/remove_copy.hpp +++ b/sprout/range/algorithm/fixed/remove_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // remove_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy(InputRange const& rng, Result const& result, T const& value) { return sprout::fixed::remove_copy(sprout::begin(rng), sprout::end(rng), result, value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy(InputRange const& rng, T const& value) { return sprout::fixed::remove_copy(sprout::begin(rng), sprout::end(rng), value); } diff --git a/sprout/range/algorithm/fixed/remove_copy_if.hpp b/sprout/range/algorithm/fixed/remove_copy_if.hpp index 2aee8a36..deb92f70 100644 --- a/sprout/range/algorithm/fixed/remove_copy_if.hpp +++ b/sprout/range/algorithm/fixed/remove_copy_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // remove_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy_if(InputRange const& rng, Result const& result, Predicate pred) { return sprout::fixed::remove_copy_if(sprout::begin(rng), sprout::end(rng), result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type remove_copy_if(InputRange const& rng, Predicate pred) { return sprout::fixed::remove_copy_if(sprout::begin(rng), sprout::end(rng), pred); } diff --git a/sprout/range/algorithm/fixed/replace_copy.hpp b/sprout/range/algorithm/fixed/replace_copy.hpp index 975c7de2..6bd71a7d 100644 --- a/sprout/range/algorithm/fixed/replace_copy.hpp +++ b/sprout/range/algorithm/fixed/replace_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // replace_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy(InputRange const& rng, Result const& result, T const& old_value, T const& new_value) { return sprout::fixed::replace_copy(sprout::begin(rng), sprout::end(rng), result, old_value, new_value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy(InputRange const& rng, T const& old_value, T const& new_value) { return sprout::fixed::replace_copy(sprout::begin(rng), sprout::end(rng), old_value, new_value); } diff --git a/sprout/range/algorithm/fixed/replace_copy_if.hpp b/sprout/range/algorithm/fixed/replace_copy_if.hpp index 0c34d537..5b9d9c87 100644 --- a/sprout/range/algorithm/fixed/replace_copy_if.hpp +++ b/sprout/range/algorithm/fixed/replace_copy_if.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // replace_copy_if // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if(InputRange const& rng, Result const& result, Predicate pred, T const& new_value) { return sprout::fixed::replace_copy_if(sprout::begin(rng), sprout::end(rng), result, pred, new_value); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type replace_copy_if(InputRange const& rng, Predicate pred, T const& new_value) { return sprout::fixed::replace_copy_if(sprout::begin(rng), sprout::end(rng), pred, new_value); } diff --git a/sprout/range/algorithm/fixed/reverse_copy.hpp b/sprout/range/algorithm/fixed/reverse_copy.hpp index ad12064a..d4bddca3 100644 --- a/sprout/range/algorithm/fixed/reverse_copy.hpp +++ b/sprout/range/algorithm/fixed/reverse_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // reverse_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy(BidirectionalRange const& rng, Result const& result) { return sprout::fixed::reverse_copy(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type reverse_copy(BidirectionalRange const& rng) { return sprout::fixed::reverse_copy(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/algorithm/fixed/rotate_copy.hpp b/sprout/range/algorithm/fixed/rotate_copy.hpp index a1c86095..25e7f984 100644 --- a/sprout/range/algorithm/fixed/rotate_copy.hpp +++ b/sprout/range/algorithm/fixed/rotate_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // rotate_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy( ForwardRange const& rng, typename sprout::container_traits::const_iterator middle, Result const& result @@ -31,7 +31,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type rotate_copy( ForwardRange const& rng, typename sprout::container_traits::const_iterator middle ) diff --git a/sprout/range/algorithm/fixed/set_difference.hpp b/sprout/range/algorithm/fixed/set_difference.hpp index 9af93784..42fbe694 100644 --- a/sprout/range/algorithm/fixed/set_difference.hpp +++ b/sprout/range/algorithm/fixed/set_difference.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,23 +20,23 @@ namespace sprout { // set_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fixed::set_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fixed::set_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference(InputRange1 const& rng1, InputRange2 const& rng2, Compare comp) { return sprout::fixed::set_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_difference(InputRange1 const& rng1, InputRange2 const& rng2) { return sprout::fixed::set_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2)); } diff --git a/sprout/range/algorithm/fixed/set_intersection.hpp b/sprout/range/algorithm/fixed/set_intersection.hpp index 727488c6..14ecd080 100644 --- a/sprout/range/algorithm/fixed/set_intersection.hpp +++ b/sprout/range/algorithm/fixed/set_intersection.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,23 +20,23 @@ namespace sprout { // set_intersection // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fixed::set_intersection(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fixed::set_intersection(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection(InputRange1 const& rng1, InputRange2 const& rng2, Compare comp) { return sprout::fixed::set_intersection(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_intersection(InputRange1 const& rng1, InputRange2 const& rng2) { return sprout::fixed::set_intersection(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2)); } diff --git a/sprout/range/algorithm/fixed/set_symmetric_difference.hpp b/sprout/range/algorithm/fixed/set_symmetric_difference.hpp index 531dd8ae..5b5cedb3 100644 --- a/sprout/range/algorithm/fixed/set_symmetric_difference.hpp +++ b/sprout/range/algorithm/fixed/set_symmetric_difference.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,23 +20,23 @@ namespace sprout { // set_symmetric_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fixed::set_symmetric_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fixed::set_symmetric_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference(InputRange1 const& rng1, InputRange2 const& rng2, Compare comp) { return sprout::fixed::set_symmetric_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_symmetric_difference(InputRange1 const& rng1, InputRange2 const& rng2) { return sprout::fixed::set_symmetric_difference(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2)); } diff --git a/sprout/range/algorithm/fixed/set_union.hpp b/sprout/range/algorithm/fixed/set_union.hpp index d6e421e8..940accd0 100644 --- a/sprout/range/algorithm/fixed/set_union.hpp +++ b/sprout/range/algorithm/fixed/set_union.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,23 +20,23 @@ namespace sprout { // set_union // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, Compare comp) { return sprout::fixed::set_union(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result, comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result) { return sprout::fixed::set_union(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union(InputRange1 const& rng1, InputRange2 const& rng2, Compare comp) { return sprout::fixed::set_union(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2), comp); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type set_union(InputRange1 const& rng1, InputRange2 const& rng2) { return sprout::fixed::set_union(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), sprout::end(rng2)); } diff --git a/sprout/range/algorithm/fixed/stable_partition_copy.hpp b/sprout/range/algorithm/fixed/stable_partition_copy.hpp index b9bbe680..61a420c6 100644 --- a/sprout/range/algorithm/fixed/stable_partition_copy.hpp +++ b/sprout/range/algorithm/fixed/stable_partition_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,13 +20,13 @@ namespace sprout { // stable_partition_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_partition_copy(BidirectionalRange const& rng, Result const& result, Predicate pred) { return sprout::fixed::stable_partition_copy(sprout::begin(rng), sprout::end(rng), result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type stable_partition_copy(BidirectionalRange const& rng, Predicate pred) { return sprout::fixed::stable_partition_copy(sprout::begin(rng), sprout::end(rng), pred); } diff --git a/sprout/range/algorithm/fixed/swap_element_copy.hpp b/sprout/range/algorithm/fixed/swap_element_copy.hpp index 340c2ebe..033ff898 100644 --- a/sprout/range/algorithm/fixed/swap_element_copy.hpp +++ b/sprout/range/algorithm/fixed/swap_element_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // swap_element_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element_copy( ForwardRange const& rng, Result const& result, typename sprout::container_traits::const_iterator pos1, @@ -32,7 +32,7 @@ namespace sprout { } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type swap_element_copy( ForwardRange const& rng, typename sprout::container_traits::const_iterator pos1, diff --git a/sprout/range/algorithm/fixed/transform.hpp b/sprout/range/algorithm/fixed/transform.hpp index 3cc7e1ca..f42fa8f7 100644 --- a/sprout/range/algorithm/fixed/transform.hpp +++ b/sprout/range/algorithm/fixed/transform.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,23 +20,23 @@ namespace sprout { // transform // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputRange const& rng, Result const& result, UnaryOperation op) { return sprout::fixed::transform(sprout::begin(rng), sprout::end(rng), result, op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputRange1 const& rng1, InputRange2 const& rng2, Result const& result, BinaryOperation op) { return sprout::fixed::transform(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), result, op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputRange const& rng, UnaryOperation op) { return sprout::fixed::transform(sprout::begin(rng), sprout::end(rng), op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type transform(InputRange1 const& rng1, InputRange2 const& rng2, BinaryOperation op) { return sprout::fixed::transform(sprout::begin(rng1), sprout::end(rng1), sprout::begin(rng2), op); } diff --git a/sprout/range/algorithm/fixed/unique_copy.hpp b/sprout/range/algorithm/fixed/unique_copy.hpp index 8e87d8cf..aa5fc7c5 100644 --- a/sprout/range/algorithm/fixed/unique_copy.hpp +++ b/sprout/range/algorithm/fixed/unique_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,23 +20,23 @@ namespace sprout { // unique_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputRange const& rng, Result const& result, BinaryPredicate pred) { return sprout::fixed::unique_copy(sprout::begin(rng), sprout::end(rng), result, pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputRange const& rng, Result const& result) { return sprout::fixed::unique_copy(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputRange const& rng, BinaryPredicate pred) { return sprout::fixed::unique_copy(sprout::begin(rng), sprout::end(rng), pred); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type unique_copy(InputRange const& rng) { return sprout::fixed::unique_copy(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/algorithm/string/fit/to_lower_copy.hpp b/sprout/range/algorithm/string/fit/to_lower_copy.hpp index 1b09dde1..89343277 100644 --- a/sprout/range/algorithm/string/fit/to_lower_copy.hpp +++ b/sprout/range/algorithm/string/fit/to_lower_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // to_lower_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_lower_copy(InputRange const& rng, Result const& result) { return sprout::fit::to_lower_copy(sprout::begin(rng), sprout::end(rng), result); } diff --git a/sprout/range/algorithm/string/fit/to_upper_copy.hpp b/sprout/range/algorithm/string/fit/to_upper_copy.hpp index c4296ef9..be778c48 100644 --- a/sprout/range/algorithm/string/fit/to_upper_copy.hpp +++ b/sprout/range/algorithm/string/fit/to_upper_copy.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -21,7 +21,7 @@ namespace sprout { // to_upper_copy // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type to_upper_copy(InputRange const& rng, Result const& result) { return sprout::fit::to_upper_copy(sprout::begin(rng), sprout::end(rng), result); } diff --git a/sprout/range/algorithm/string/fixed/to_lower_copy.hpp b/sprout/range/algorithm/string/fixed/to_lower_copy.hpp index 8331ea53..0ec319eb 100644 --- a/sprout/range/algorithm/string/fixed/to_lower_copy.hpp +++ b/sprout/range/algorithm/string/fixed/to_lower_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -22,13 +22,13 @@ namespace sprout { // to_lower_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_lower_copy(InputRange const& rng, Result const& result) { return sprout::algorithm::fixed::to_lower_copy(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_lower_copy(InputRange const& rng) { return sprout::algorithm::fixed::to_lower_copy(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/algorithm/string/fixed/to_upper_copy.hpp b/sprout/range/algorithm/string/fixed/to_upper_copy.hpp index ca54d60f..080ee375 100644 --- a/sprout/range/algorithm/string/fixed/to_upper_copy.hpp +++ b/sprout/range/algorithm/string/fixed/to_upper_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -22,13 +22,13 @@ namespace sprout { // to_upper_copy // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_upper_copy(InputRange const& rng, Result const& result) { return sprout::algorithm::fixed::to_upper_copy(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type to_upper_copy(InputRange const& rng) { return sprout::algorithm::fixed::to_upper_copy(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fit/amplitude_spectrum.hpp b/sprout/range/numeric/dft/fit/amplitude_spectrum.hpp index f99c0c5d..6b806837 100644 --- a/sprout/range/numeric/dft/fit/amplitude_spectrum.hpp +++ b/sprout/range/numeric/dft/fit/amplitude_spectrum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // amplitude_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type amplitude_spectrum(InputRange const& rng, Result const& result) { return sprout::fit::amplitude_spectrum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type amplitude_spectrum(InputRange const& rng) { return sprout::fit::amplitude_spectrum(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fit/dft.hpp b/sprout/range/numeric/dft/fit/dft.hpp index 7cf2040b..7284f12e 100644 --- a/sprout/range/numeric/dft/fit/dft.hpp +++ b/sprout/range/numeric/dft/fit/dft.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // dft // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type dft(ForwardRange const& rng, Result const& result) { return sprout::fit::dft(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type dft(ForwardRange const& rng) { return sprout::fit::dft(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fit/idft.hpp b/sprout/range/numeric/dft/fit/idft.hpp index bad76011..8c50409b 100644 --- a/sprout/range/numeric/dft/fit/idft.hpp +++ b/sprout/range/numeric/dft/fit/idft.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // idft // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type idft(ForwardRange const& rng, Result const& result) { return sprout::fit::idft(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type idft(ForwardRange const& rng) { return sprout::fit::idft(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fit/phase_spectrum.hpp b/sprout/range/numeric/dft/fit/phase_spectrum.hpp index 954b225f..5cef0d9e 100644 --- a/sprout/range/numeric/dft/fit/phase_spectrum.hpp +++ b/sprout/range/numeric/dft/fit/phase_spectrum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // phase_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type phase_spectrum(InputRange const& rng, Result const& result) { return sprout::fit::phase_spectrum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type phase_spectrum(InputRange const& rng) { return sprout::fit::phase_spectrum(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fit/spectrum.hpp b/sprout/range/numeric/dft/fit/spectrum.hpp index 9adb7e7d..65e2e869 100644 --- a/sprout/range/numeric/dft/fit/spectrum.hpp +++ b/sprout/range/numeric/dft/fit/spectrum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type spectrum(InputRange const& rng, Result const& result) { return sprout::fit::spectrum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type spectrum(InputRange const& rng) { return sprout::fit::spectrum(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fixed/amplitude_spectrum.hpp b/sprout/range/numeric/dft/fixed/amplitude_spectrum.hpp index 5756dfad..99cd52de 100644 --- a/sprout/range/numeric/dft/fixed/amplitude_spectrum.hpp +++ b/sprout/range/numeric/dft/fixed/amplitude_spectrum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // amplitude_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type amplitude_spectrum(InputRange const& rng, Result const& result) { return sprout::fixed::amplitude_spectrum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type amplitude_spectrum(InputRange const& rng) { return sprout::fixed::amplitude_spectrum(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fixed/dft.hpp b/sprout/range/numeric/dft/fixed/dft.hpp index 7d78f996..481cb086 100644 --- a/sprout/range/numeric/dft/fixed/dft.hpp +++ b/sprout/range/numeric/dft/fixed/dft.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // dft // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft(ForwardRange const& rng, Result const& result) { return sprout::fixed::dft(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type dft(ForwardRange const& rng) { return sprout::fixed::dft(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fixed/idft.hpp b/sprout/range/numeric/dft/fixed/idft.hpp index 523c2283..02276155 100644 --- a/sprout/range/numeric/dft/fixed/idft.hpp +++ b/sprout/range/numeric/dft/fixed/idft.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // idft // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft(ForwardRange const& rng, Result const& result) { return sprout::fixed::idft(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type idft(ForwardRange const& rng) { return sprout::fixed::idft(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fixed/phase_spectrum.hpp b/sprout/range/numeric/dft/fixed/phase_spectrum.hpp index 46f5377e..4ea65e66 100644 --- a/sprout/range/numeric/dft/fixed/phase_spectrum.hpp +++ b/sprout/range/numeric/dft/fixed/phase_spectrum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // phase_spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type phase_spectrum(InputRange const& rng, Result const& result) { return sprout::fixed::phase_spectrum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type phase_spectrum(InputRange const& rng) { return sprout::fixed::phase_spectrum(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/dft/fixed/spectrum.hpp b/sprout/range/numeric/dft/fixed/spectrum.hpp index 620dd070..5f4727c2 100644 --- a/sprout/range/numeric/dft/fixed/spectrum.hpp +++ b/sprout/range/numeric/dft/fixed/spectrum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,13 +21,13 @@ namespace sprout { // spectrum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type spectrum(InputRange const& rng, Result const& result) { return sprout::fixed::spectrum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type spectrum(InputRange const& rng) { return sprout::fixed::spectrum(sprout::begin(rng), sprout::end(rng)); } diff --git a/sprout/range/numeric/fit/adjacent_difference.hpp b/sprout/range/numeric/fit/adjacent_difference.hpp index 70a5b101..f2c1d6f1 100644 --- a/sprout/range/numeric/fit/adjacent_difference.hpp +++ b/sprout/range/numeric/fit/adjacent_difference.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,23 +21,23 @@ namespace sprout { // adjacent_difference // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference(InputRange const& rng, Result const& result) { return sprout::fit::adjacent_difference(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference(InputRange const& rng, Result const& result, BinaryOperation binary_op) { return sprout::fit::adjacent_difference(sprout::begin(rng), sprout::end(rng), result, binary_op); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference(InputRange const& rng) { return sprout::fit::adjacent_difference(sprout::begin(rng), sprout::end(rng)); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type adjacent_difference(InputRange const& rng, BinaryOperation binary_op) { return sprout::fit::adjacent_difference(sprout::begin(rng), sprout::end(rng), binary_op); } diff --git a/sprout/range/numeric/fit/partial_sum.hpp b/sprout/range/numeric/fit/partial_sum.hpp index 391d98ee..235bb8be 100644 --- a/sprout/range/numeric/fit/partial_sum.hpp +++ b/sprout/range/numeric/fit/partial_sum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,23 +21,23 @@ namespace sprout { // partial_sum // template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum(InputRange const& rng, Result const& result) { return sprout::fit::partial_sum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum(InputRange const& rng, Result const& result, BinaryOperation binary_op) { return sprout::fit::partial_sum(sprout::begin(rng), sprout::end(rng), result, binary_op); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum(InputRange const& rng) { return sprout::fit::partial_sum(sprout::begin(rng), sprout::end(rng)); } template - inline SPROUT_CONSTEXPR typename sprout::fit::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fit::results::algorithm::type partial_sum(InputRange const& rng, BinaryOperation binary_op) { return sprout::fit::partial_sum(sprout::begin(rng), sprout::end(rng), binary_op); } diff --git a/sprout/range/numeric/fixed/adjacent_difference.hpp b/sprout/range/numeric/fixed/adjacent_difference.hpp index 9a2d17ff..ce89d0bb 100644 --- a/sprout/range/numeric/fixed/adjacent_difference.hpp +++ b/sprout/range/numeric/fixed/adjacent_difference.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,23 +21,23 @@ namespace sprout { // adjacent_difference // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputRange const& rng, Result const& result) { return sprout::fixed::adjacent_difference(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputRange const& rng, Result const& result, BinaryOperation binary_op) { return sprout::fixed::adjacent_difference(sprout::begin(rng), sprout::end(rng), result, binary_op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputRange const& rng) { return sprout::fixed::adjacent_difference(sprout::begin(rng), sprout::end(rng)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type adjacent_difference(InputRange const& rng, BinaryOperation binary_op) { return sprout::fixed::adjacent_difference(sprout::begin(rng), sprout::end(rng), binary_op); } diff --git a/sprout/range/numeric/fixed/partial_sum.hpp b/sprout/range/numeric/fixed/partial_sum.hpp index 81223078..9236db6d 100644 --- a/sprout/range/numeric/fixed/partial_sum.hpp +++ b/sprout/range/numeric/fixed/partial_sum.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { @@ -21,23 +21,23 @@ namespace sprout { // partial_sum // template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputRange const& rng, Result const& result) { return sprout::fixed::partial_sum(sprout::begin(rng), sprout::end(rng), result); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputRange const& rng, Result const& result, BinaryOperation binary_op) { return sprout::fixed::partial_sum(sprout::begin(rng), sprout::end(rng), result, binary_op); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputRange const& rng) { return sprout::fixed::partial_sum(sprout::begin(rng), sprout::end(rng)); } template - inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm::type + inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm::type partial_sum(InputRange const& rng, BinaryOperation binary_op) { return sprout::fixed::partial_sum(sprout::begin(rng), sprout::end(rng), binary_op); } diff --git a/sprout/tpp/algorithm.hpp b/sprout/tpp/algorithm.hpp index 97c4950b..79d94bba 100644 --- a/sprout/tpp/algorithm.hpp +++ b/sprout/tpp/algorithm.hpp @@ -13,5 +13,7 @@ #include #include #include +#include +#include #endif // #ifndef SPROUT_TPP_ALGORITHM_HPP diff --git a/sprout/tpp/algorithm/all_of.hpp b/sprout/tpp/algorithm/all_of.hpp index 8f50223c..363d6f18 100644 --- a/sprout/tpp/algorithm/all_of.hpp +++ b/sprout/tpp/algorithm/all_of.hpp @@ -10,6 +10,7 @@ #include #include +#include namespace sprout { namespace tpp { @@ -18,23 +19,23 @@ namespace sprout { struct all_of_impl; template<> struct all_of_impl<> - : public std::true_type + : public sprout::true_type {}; template<> struct all_of_impl - : public std::true_type + : public sprout::true_type {}; template<> struct all_of_impl - : public std::false_type + : public sprout::false_type {}; template struct all_of_impl - : public std::integral_constant::value> + : public sprout::integral_constant::value> {}; template struct all_of_impl - : public std::false_type + : public sprout::false_type {}; } // namespace detail // diff --git a/sprout/tpp/algorithm/any_of.hpp b/sprout/tpp/algorithm/any_of.hpp index 06b7afd5..7eb06712 100644 --- a/sprout/tpp/algorithm/any_of.hpp +++ b/sprout/tpp/algorithm/any_of.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TPP_ALGORITHM_ANY_OF_HPP #define SPROUT_TPP_ALGORITHM_ANY_OF_HPP -#include #include +#include namespace sprout { namespace tpp { @@ -18,23 +18,23 @@ namespace sprout { struct any_of_impl; template<> struct any_of_impl<> - : public std::false_type + : public sprout::false_type {}; template<> struct any_of_impl - : public std::true_type + : public sprout::true_type {}; template<> struct any_of_impl - : public std::false_type + : public sprout::false_type {}; template struct any_of_impl - : public std::true_type + : public sprout::true_type {}; template struct any_of_impl - : public std::integral_constant::value> + : public sprout::integral_constant::value> {}; } // namespace detail // diff --git a/sprout/tpp/algorithm/max_element.hpp b/sprout/tpp/algorithm/max_element.hpp new file mode 100644 index 00000000..042e0a77 --- /dev/null +++ b/sprout/tpp/algorithm/max_element.hpp @@ -0,0 +1,50 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_TPP_ALGORITHM_MAX_ELEMENT_HPP +#define SPROUT_TPP_ALGORITHM_MAX_ELEMENT_HPP + +#include +#include +#include + +namespace sprout { + namespace tpp { + namespace detail { + template + struct max_element_impl; + template + struct max_element_impl + : public sprout::integral_constant + {}; + template + struct max_element_impl + : public sprout::integral_constant + {}; + template + struct max_element_impl + : public sprout::tpp::detail::max_element_impl::value, Tail...> + {}; + } // namespace detail + // + // max_element_c + // + template + struct max_element_c + : public sprout::tpp::detail::max_element_impl + {}; + // + // max_element + // + template + struct max_element + : public sprout::tpp::max_element_c::type, Types::value...> + {}; + } // namespace tpp +} // namespace sprout + +#endif // #ifndef SPROUT_TPP_ALGORITHM_MAX_ELEMENT_HPP diff --git a/sprout/tpp/algorithm/min_element.hpp b/sprout/tpp/algorithm/min_element.hpp new file mode 100644 index 00000000..46388fd0 --- /dev/null +++ b/sprout/tpp/algorithm/min_element.hpp @@ -0,0 +1,50 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_TPP_ALGORITHM_MIN_ELEMENT_HPP +#define SPROUT_TPP_ALGORITHM_MIN_ELEMENT_HPP + +#include +#include +#include + +namespace sprout { + namespace tpp { + namespace detail { + template + struct min_element_impl; + template + struct min_element_impl + : public sprout::integral_constant + {}; + template + struct min_element_impl + : public sprout::integral_constant + {}; + template + struct min_element_impl + : public sprout::tpp::detail::min_element_impl::value, Tail...> + {}; + } // namespace detail + // + // min_element_c + // + template + struct min_element_c + : public sprout::tpp::detail::min_element_impl + {}; + // + // min_element + // + template + struct min_element + : public sprout::tpp::min_element_c::type, Types::value...> + {}; + } // namespace tpp +} // namespace sprout + +#endif // #ifndef SPROUT_TPP_ALGORITHM_MIN_ELEMENT_HPP diff --git a/sprout/tpp/algorithm/none_of.hpp b/sprout/tpp/algorithm/none_of.hpp index b7724d2e..54ecb396 100644 --- a/sprout/tpp/algorithm/none_of.hpp +++ b/sprout/tpp/algorithm/none_of.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TPP_ALGORITHM_NONE_OF_HPP #define SPROUT_TPP_ALGORITHM_NONE_OF_HPP -#include #include +#include namespace sprout { namespace tpp { @@ -18,23 +18,23 @@ namespace sprout { struct none_of_impl; template<> struct none_of_impl<> - : public std::true_type + : public sprout::true_type {}; template<> struct none_of_impl - : public std::false_type + : public sprout::false_type {}; template<> struct none_of_impl - : public std::true_type + : public sprout::true_type {}; template struct none_of_impl - : public std::false_type + : public sprout::false_type {}; template struct none_of_impl - : public std::integral_constant::value> + : public sprout::integral_constant::value> {}; } // namespace detail // diff --git a/sprout/tpp/algorithm/one_of.hpp b/sprout/tpp/algorithm/one_of.hpp index 47979537..95787366 100644 --- a/sprout/tpp/algorithm/one_of.hpp +++ b/sprout/tpp/algorithm/one_of.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_TPP_ALGORITHM_ONE_OF_HPP #define SPROUT_TPP_ALGORITHM_ONE_OF_HPP -#include #include #include +#include namespace sprout { namespace tpp { @@ -19,15 +19,15 @@ namespace sprout { struct one_of_impl; template<> struct one_of_impl<> - : public std::false_type + : public sprout::false_type {}; template<> struct one_of_impl - : public std::true_type + : public sprout::true_type {}; template<> struct one_of_impl - : public std::false_type + : public sprout::false_type {}; template struct one_of_impl @@ -35,7 +35,7 @@ namespace sprout { {}; template struct one_of_impl - : public std::integral_constant::value> + : public sprout::integral_constant::value> {}; } // namespace detail // diff --git a/sprout/tuple/algorithm/copy.hpp b/sprout/tuple/algorithm/copy.hpp index 5f60bfe5..d97f196f 100644 --- a/sprout/tuple/algorithm/copy.hpp +++ b/sprout/tuple/algorithm/copy.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace tuples { - namespace result_of { + namespace results { // // copy // @@ -26,7 +26,7 @@ namespace sprout { public: typedef typename sprout::tuples::tuple_construct_traits::copied_type type; }; - } // namespace result_of + } // namespace results namespace detail { template @@ -45,10 +45,10 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< (sprout::tuples::tuple_size::value > sprout::tuples::tuple_size::value), - typename sprout::tuples::result_of::copy::type + typename sprout::tuples::results::copy::type >::type copy(Tuple const& t, InputTuple const& input) { - return sprout::tuples::detail::copy_impl::type>( + return sprout::tuples::detail::copy_impl::type>( t, input, sprout::index_range::value, sprout::tuples::tuple_size::value>::make(), sprout::tuple_indexes::make() @@ -57,10 +57,10 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !(sprout::tuples::tuple_size::value > sprout::tuples::tuple_size::value), - typename sprout::tuples::result_of::copy::type + typename sprout::tuples::results::copy::type >::type copy(Tuple const& t, InputTuple const& input) { - return sprout::tuples::detail::copy_impl::type>( + return sprout::tuples::detail::copy_impl::type>( t, input, sprout::index_tuple<>(), sprout::tuple_indexes::make() @@ -71,7 +71,7 @@ namespace sprout { // copy // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::copy::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::copy::type copy(Tuple const& t, InputTuple const& input) { return sprout::tuples::detail::copy(t, input); } diff --git a/sprout/tuple/operation/append_back.hpp b/sprout/tuple/operation/append_back.hpp index 712c9c07..c0206128 100644 --- a/sprout/tuple/operation/append_back.hpp +++ b/sprout/tuple/operation/append_back.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace tuples { - namespace result_of { + namespace results { // // append_back // @@ -25,7 +25,7 @@ namespace sprout { struct append_back : public sprout::types::append_back {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -46,9 +46,9 @@ namespace sprout { // append_back // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::append_back::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::append_back::type append_back(Tuple const& t, InputTuple const& input) { - return sprout::tuples::detail::append_back_impl::type>( + return sprout::tuples::detail::append_back_impl::type>( t, input, sprout::tuple_indexes::make(), sprout::tuple_indexes::make() diff --git a/sprout/tuple/operation/append_front.hpp b/sprout/tuple/operation/append_front.hpp index f1f2af48..97f124a8 100644 --- a/sprout/tuple/operation/append_front.hpp +++ b/sprout/tuple/operation/append_front.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace tuples { - namespace result_of { + namespace results { // // append_front // @@ -25,7 +25,7 @@ namespace sprout { struct append_front : public sprout::types::append_front {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -46,9 +46,9 @@ namespace sprout { // append_front // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::append_front::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::append_front::type append_front(Tuple const& t, InputTuple const& input) { - return sprout::tuples::detail::append_front_impl::type>( + return sprout::tuples::detail::append_front_impl::type>( t, input, sprout::tuple_indexes::make(), sprout::tuple_indexes::make() diff --git a/sprout/tuple/operation/pop_back.hpp b/sprout/tuple/operation/pop_back.hpp index 3dd0b651..5fc1f371 100644 --- a/sprout/tuple/operation/pop_back.hpp +++ b/sprout/tuple/operation/pop_back.hpp @@ -16,7 +16,7 @@ namespace sprout { namespace tuples { - namespace result_of { + namespace results { // // pop_back // @@ -24,7 +24,7 @@ namespace sprout { struct pop_back : public sprout::types::pop_back {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -40,9 +40,9 @@ namespace sprout { // pop_back // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::pop_back::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::pop_back::type pop_back(Tuple const& t) { - return sprout::tuples::detail::pop_back_impl::type>( + return sprout::tuples::detail::pop_back_impl::type>( t, sprout::make_index_tuple::value - 1>::make() ); diff --git a/sprout/tuple/operation/pop_front.hpp b/sprout/tuple/operation/pop_front.hpp index a59dd6f1..b4c7a328 100644 --- a/sprout/tuple/operation/pop_front.hpp +++ b/sprout/tuple/operation/pop_front.hpp @@ -16,7 +16,7 @@ namespace sprout { namespace tuples { - namespace result_of { + namespace results { // // pop_front // @@ -24,7 +24,7 @@ namespace sprout { struct pop_front : public sprout::types::pop_front {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -40,9 +40,9 @@ namespace sprout { // pop_front // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::pop_front::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::pop_front::type pop_front(Tuple const& t) { - return sprout::tuples::detail::pop_front_impl::type>( + return sprout::tuples::detail::pop_front_impl::type>( t, sprout::index_range<1, sprout::tuples::tuple_size::value>::make() ); diff --git a/sprout/tuple/operation/push_back.hpp b/sprout/tuple/operation/push_back.hpp index 28e975c1..41b82fba 100644 --- a/sprout/tuple/operation/push_back.hpp +++ b/sprout/tuple/operation/push_back.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace tuples { - namespace result_of { + namespace results { // // push_back // @@ -25,7 +25,7 @@ namespace sprout { struct push_back : public sprout::types::push_back {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -42,9 +42,9 @@ namespace sprout { // push_back // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::push_back::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::push_back::type push_back(Tuple const& t, Args const&... args) { - return sprout::tuples::detail::push_back_impl::type>( + return sprout::tuples::detail::push_back_impl::type>( t, sprout::tuple_indexes::make(), args... diff --git a/sprout/tuple/operation/push_front.hpp b/sprout/tuple/operation/push_front.hpp index e7f9416d..1f4e824a 100644 --- a/sprout/tuple/operation/push_front.hpp +++ b/sprout/tuple/operation/push_front.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace tuples { - namespace result_of { + namespace results { // // push_front // @@ -25,7 +25,7 @@ namespace sprout { struct push_front : public sprout::types::push_front {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -42,9 +42,9 @@ namespace sprout { // push_front // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::push_front::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::push_front::type push_front(Tuple const& t, Args const&... args) { - return sprout::tuples::detail::push_front_impl::type>( + return sprout::tuples::detail::push_front_impl::type>( t, sprout::tuple_indexes::make(), args... diff --git a/sprout/tuple/tuple/make_tuple.hpp b/sprout/tuple/tuple/make_tuple.hpp index ff398e5e..5f2a04a5 100644 --- a/sprout/tuple/tuple/make_tuple.hpp +++ b/sprout/tuple/tuple/make_tuple.hpp @@ -46,7 +46,7 @@ namespace sprout { return sprout::tuples::tuple(args...); } - namespace result_of { + namespace results { namespace detail { template struct tuple_cat_impl; @@ -83,7 +83,7 @@ namespace sprout { > type; }; public: - typedef typename sprout::tuples::result_of::detail::tuple_cat_impl< + typedef typename sprout::tuples::results::detail::tuple_cat_impl< typename make< T, typename sprout::tuple_indexes::type, U, typename sprout::tuple_indexes::type @@ -97,11 +97,11 @@ namespace sprout { // template struct tuple_cat - : public sprout::tuples::result_of::detail::tuple_cat_impl< + : public sprout::tuples::results::detail::tuple_cat_impl< typename std::decay::type... > {}; - } // namespace result_of + } // namespace results namespace detail { template @@ -148,19 +148,19 @@ namespace sprout { // tuple_cat // template - inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::tuple_cat::type + inline SPROUT_CONSTEXPR typename sprout::tuples::results::tuple_cat::type tuple_cat(Tuples&&... tuples) { return sprout::tuples::detail::tuple_cat_impl< - typename sprout::tuples::result_of::tuple_cat::type, + typename sprout::tuples::results::tuple_cat::type, typename sprout::tuples::detail::tuple_cat_1st_indexes::type, Tuples... >::call(sprout::forward(tuples)...); } } // namespace tuples - namespace result_of { - using sprout::tuples::result_of::tuple_cat; - } // namespace result_of + namespace results { + using sprout::tuples::results::tuple_cat; + } // namespace results using sprout::tuples::make_tuple; using sprout::tuples::forward_as_tuple; diff --git a/sprout/tuple/tuple/tuple_decl.hpp b/sprout/tuple/tuple/tuple_decl.hpp index 5c9396e4..e45b9b49 100644 --- a/sprout/tuple/tuple/tuple_decl.hpp +++ b/sprout/tuple/tuple/tuple_decl.hpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -187,7 +188,7 @@ namespace sprout { , base_type(sprout::forward(h)) {} tuple_impl(tuple_impl const&) = default; -#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1)) +#if SPROUT_GCC_BETWEEN(4, 8, 0, 4, 8, 2) tuple_impl(tuple_impl&&) = default; #else SPROUT_CONSTEXPR tuple_impl(tuple_impl&& t) diff --git a/sprout/type_traits.hpp b/sprout/type_traits.hpp index 1b8df81d..a63fb742 100644 --- a/sprout/type_traits.hpp +++ b/sprout/type_traits.hpp @@ -9,6 +9,7 @@ #define SPROUT_TYPE_TRAITS_HPP #include +#include #include #include #include @@ -28,6 +29,5 @@ #include #include #include -#include #endif // #ifndef SPROUT_TYPE_TRAITS_HPP diff --git a/sprout/type_traits/aliases.hpp b/sprout/type_traits/aliases.hpp deleted file mode 100644 index b4c34e71..00000000 --- a/sprout/type_traits/aliases.hpp +++ /dev/null @@ -1,172 +0,0 @@ -/*============================================================================= - Copyright (c) 2011-2013 Bolero MURAKAMI - https://github.com/bolero-MURAKAMI/Sprout - - Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -=============================================================================*/ -#ifndef SPROUT_TYPE_TRAITS_ALIASES_HPP -#define SPROUT_TYPE_TRAITS_ALIASES_HPP - -#include -#if SPROUT_USE_TEMPLATE_ALIASES -# include -# include -#endif // #if SPROUT_USE_TEMPLATE_ALIASES - -namespace sprout { -#if SPROUT_USE_TEMPLATE_ALIASES - // Copyright (c) 2011 osyo-manga : http://d.hatena.ne.jp/osyo-manga/ - - // - // Const-volatility specifiers - // - template - using remove_const_t = typename std::remove_const::type; - template - using remove_volatile_t = typename std::remove_volatile::type; - template - using remove_cv_t = typename std::remove_cv::type; - template - using add_const_t = typename std::add_const::type; - template - using add_volatile_t = typename std::add_volatile::type; - template - using add_cv_t = typename std::add_cv::type; - - // - // References - // - template - using remove_reference_t = typename std::remove_reference::type; - template - using add_lvalue_reference_t = typename std::add_lvalue_reference::type; - template - using add_rvalue_reference_t = typename std::add_rvalue_reference::type; - - // - // Pointers - // - template - using remove_pointer_t = typename std::remove_pointer::type; - template - using add_pointer_t = typename std::add_pointer::type; - - // - // Sign modifiers - // - template - using make_signed_t = typename std::make_signed::type; - template - using make_unsigned_t = typename std::make_unsigned::type; - - // - // Arrays - // - template - using remove_extent_t = typename std::remove_extent::type; - template - using remove_all_extents_t = typename std::remove_all_extents::type; - - // - // Miscellaneous transformations - // - template< - std::size_t Len, - std::size_t Align = std::alignment_of::type>::value - > - using aligned_storage_t = typename std::aligned_storage::type; -#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101) - template - using aligned_union_t = typename std::aligned_union::type; -#endif - template - using decay_t = typename std::decay::type; - template - using enable_if_t = typename std::enable_if::type; - template - using conditional_t = typename std::conditional::type; - template - using common_type_t = typename std::common_type::type; - template - using underlying_type_t = typename std::underlying_type::type; - template - using result_of_t = typename std::result_of::type; - - - // - // Const-volatility specifiers - // - template - using remove_const = sprout::remove_const_t; - template - using remove_volatile = sprout::remove_volatile_t; - template - using remove_cv = sprout::remove_cv_t; - template - using add_const = sprout::add_const_t; - template - using add_volatile = sprout::add_volatile_t; - template - using add_cv = sprout::add_cv_t; - - // - // References - // - template - using remove_reference = sprout::remove_reference_t; - template - using add_lvalue_reference = sprout::add_lvalue_reference_t; - template - using add_rvalue_reference = sprout::add_rvalue_reference_t; - - // - // Pointers - // - template - using remove_pointer = sprout::remove_pointer_t; - template - using add_pointer = sprout::add_pointer_t; - - // - // Sign modifiers - // - template - using make_signed = sprout::make_signed_t; - template - using make_unsigned = sprout::make_unsigned_t; - - // - // Arrays - // - template - using remove_extent = sprout::remove_extent_t; - template - using remove_all_extents = sprout::remove_all_extents_t; - - // - // Miscellaneous transformations - // - template< - std::size_t Len, - std::size_t Align = std::alignment_of::type>::value - > - using aligned_storage = sprout::aligned_storage_t; -#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101) - template - using aligned_union = sprout::aligned_union_t; -#endif - template - using decay = sprout::decay_t; - template - using enable_if = sprout::enable_if_t; - template - using conditional = sprout::conditional_t; - template - using common_type = sprout::common_type_t; - template - using underlying_type = sprout::underlying_type_t; -#endif // #if SPROUT_USE_TEMPLATE_ALIASES -} // namespace sprout - -#endif // #ifndef SPROUT_TYPE_TRAITS_ALIASES_HPP diff --git a/sprout/type_traits/arithmetic_promote.hpp b/sprout/type_traits/arithmetic_promote.hpp index fae8205e..38f96da9 100644 --- a/sprout/type_traits/arithmetic_promote.hpp +++ b/sprout/type_traits/arithmetic_promote.hpp @@ -8,29 +8,29 @@ #ifndef SPROUT_TYPE_TRAITS_ARITHMETIC_PROMOTE_HPP #define SPROUT_TYPE_TRAITS_ARITHMETIC_PROMOTE_HPP -#include #include #include +#include #include namespace sprout { namespace detail { - template + template struct arithmetic_promote1 : public sprout::identity { static_assert( - std::is_arithmetic::value, + sprout::is_arithmetic::value, "arithmetic_promote requires arithmetic types." ); }; - template + template struct arithmetic_promote2 - : public std::decay() + std::declval())> + : public sprout::decay() + std::declval())> { static_assert( - std::is_arithmetic::value && std::is_arithmetic::value, + sprout::is_arithmetic::value && sprout::is_arithmetic::value, "arithmetic_promote requires arithmetic types." ); }; @@ -56,7 +56,7 @@ namespace sprout { template struct arithmetic_promote : public sprout::detail::arithmetic_promote_impl< - typename std::remove_cv::type... + typename sprout::remove_cv::type... > {}; diff --git a/sprout/type_traits/const_reference.hpp b/sprout/type_traits/const_reference.hpp index 1200e6fd..91b08d4b 100644 --- a/sprout/type_traits/const_reference.hpp +++ b/sprout/type_traits/const_reference.hpp @@ -11,16 +11,16 @@ #include #include #include +#include namespace sprout { // // const_reference // template - struct const_reference { - public: - typedef decltype(sprout::as_const(std::declval())) type; - }; + struct const_reference + : public sprout::identity()))> + {}; #if SPROUT_USE_TEMPLATE_ALIASES template diff --git a/sprout/type_traits/detail/type_traits_wrapper.hpp b/sprout/type_traits/detail/type_traits_wrapper.hpp new file mode 100644 index 00000000..3807d4d6 --- /dev/null +++ b/sprout/type_traits/detail/type_traits_wrapper.hpp @@ -0,0 +1,27 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_TYPE_TRAITS_DETAIL_TYPE_TRAITS_WRAPPER_HPP +#define SPROUT_TYPE_TRAITS_DETAIL_TYPE_TRAITS_WRAPPER_HPP + +#include +#include +#include + +namespace sprout { + namespace detail { + // + // type_traits_wrapper + // + template + struct type_traits_wrapper + : public sprout::integral_constant + {}; + } // namespace detail +} // namespace sprout + +#endif // #ifndef SPROUT_TYPE_TRAITS_DETAIL_TYPE_TRAITS_WRAPPER_HPP diff --git a/sprout/type_traits/enabler_if.hpp b/sprout/type_traits/enabler_if.hpp index 874c3412..304c3554 100644 --- a/sprout/type_traits/enabler_if.hpp +++ b/sprout/type_traits/enabler_if.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_ENABLER_IF_HPP #define SPROUT_TYPE_TRAITS_ENABLER_IF_HPP -#include #include +#include namespace sprout { // @@ -23,7 +23,7 @@ namespace sprout { // template class enabler_if - : public std::enable_if + : public sprout::enable_if {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/float_promote.hpp b/sprout/type_traits/float_promote.hpp index 5df4f421..dc494e62 100644 --- a/sprout/type_traits/float_promote.hpp +++ b/sprout/type_traits/float_promote.hpp @@ -8,40 +8,40 @@ #ifndef SPROUT_TYPE_TRAITS_FLOAT_PROMOTE_HPP #define SPROUT_TYPE_TRAITS_FLOAT_PROMOTE_HPP -#include #include +#include #include namespace sprout { namespace detail { template struct float_promote1 - : public std::conditional< - std::is_floating_point::value, + : public sprout::conditional< + sprout::is_floating_point::value, T, double > { static_assert( - std::is_arithmetic::value, + sprout::is_arithmetic::value, "float_promote requires arithmetic type." ); }; template struct float_promote2 - : public std::conditional< - (std::is_same::value || std::is_same::value), + : public sprout::conditional< + (sprout::is_same::value || sprout::is_same::value), long double, - typename std::conditional< - (std::is_same::value && std::is_same::value), + typename sprout::conditional< + (sprout::is_same::value && sprout::is_same::value), float, double >::type > { static_assert( - std::is_arithmetic::value && std::is_arithmetic::value, + sprout::is_arithmetic::value && sprout::is_arithmetic::value, "float_promote requires arithmetic type." ); }; @@ -67,7 +67,7 @@ namespace sprout { template struct float_promote : public sprout::detail::float_promote_impl< - typename std::remove_cv::type... + typename sprout::remove_cv::type... > {}; diff --git a/sprout/type_traits/has_xxx.hpp b/sprout/type_traits/has_xxx.hpp index 99d3ee29..87f90e11 100644 --- a/sprout/type_traits/has_xxx.hpp +++ b/sprout/type_traits/has_xxx.hpp @@ -8,9 +8,10 @@ #ifndef SPROUT_TYPE_TRAITS_HAS_XXX_HPP #define SPROUT_TYPE_TRAITS_HAS_XXX_HPP -#include #include #include +#include +#include // // SPROUT_HAS_XXX_TYPE_DEF @@ -19,9 +20,9 @@ #if defined(_MSC_VER) #define SPROUT_HAS_XXX_TYPE_DEF(NAME, TYPE) \ template \ - std::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(int); \ + sprout::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(int); \ template \ - std::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(long); \ + sprout::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(long); \ template(0))> \ struct NAME \ : public Base_ \ @@ -29,9 +30,9 @@ #else #define SPROUT_HAS_XXX_TYPE_DEF(NAME, TYPE) \ template \ - std::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(int); \ + sprout::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(int); \ template \ - std::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(long); \ + sprout::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(long); \ template \ struct NAME \ : public decltype(SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TYPE), NAME), __LINE__)(0)) \ @@ -47,9 +48,9 @@ #if defined(_MSC_VER) #define SPROUT_HAS_XXX_VALUE_DEF(NAME, VALUE) \ template \ - std::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(int); \ + sprout::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(int); \ template \ - std::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(long); \ + sprout::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(long); \ template(0))> \ struct NAME \ : public Base_ \ @@ -57,9 +58,9 @@ #else #define SPROUT_HAS_XXX_VALUE_DEF(NAME, VALUE) \ template \ - std::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(int); \ + sprout::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(int); \ template \ - std::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(long); \ + sprout::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(long); \ template \ struct NAME \ : public decltype(SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_value_, VALUE), NAME), __LINE__)(0)) \ @@ -75,9 +76,9 @@ #if defined(_MSC_VER) #define SPROUT_HAS_XXX_TEMPLATE_DEF(NAME, TEMPLATE) \ template class = T::template TEMPLATE> \ - std::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(int); \ + sprout::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(int); \ template \ - std::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(long); \ + sprout::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(long); \ template(0))> \ struct NAME \ : public Base_ \ @@ -85,9 +86,9 @@ #else #define SPROUT_HAS_XXX_TEMPLATE_DEF(NAME, TEMPLATE) \ template class = T::template TEMPLATE> \ - std::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(int); \ + sprout::true_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(int); \ template \ - std::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(long); \ + sprout::false_type SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(long); \ template \ struct NAME \ : public decltype(SPROUT_PP_CAT(SPROUT_PP_CAT(SPROUT_PP_CAT(sprout_has_xxx_impl_check_type_, TEMPLATE), NAME), __LINE__)(0)) \ diff --git a/sprout/type_traits/inherit_if_xxx.hpp b/sprout/type_traits/inherit_if_xxx.hpp index ba83e588..fe532962 100644 --- a/sprout/type_traits/inherit_if_xxx.hpp +++ b/sprout/type_traits/inherit_if_xxx.hpp @@ -11,9 +11,9 @@ #if defined(_MSC_VER) # include #endif -#include #include #include +#include #include // @@ -27,7 +27,7 @@ template \ struct NAME< \ T, \ - typename std::enable_if::value>::type \ + typename sprout::enable_if::value>::type \ > { \ public: \ typedef typename T::TYPE ALIAS; \ @@ -56,7 +56,7 @@ template \ struct NAME< \ T, \ - typename std::enable_if::value>::type \ + typename sprout::enable_if::value>::type \ > { \ public: \ SPROUT_STATIC_CONSTEXPR std::size_t ALIAS = T::CONSTANT; \ @@ -64,7 +64,7 @@ template \ SPROUT_CONSTEXPR_OR_CONST std::size_t NAME< \ T, \ - typename std::enable_if::value>::type \ + typename sprout::enable_if::value>::type \ >::ALIAS #else #define SPROUT_INHERIT_ALIAS_IF_XXX_CONSTANT_DEF(NAME, ALIAS, CONSTANT) \ @@ -74,15 +74,15 @@ template \ struct NAME< \ T, \ - typename std::enable_if::value>::type \ + typename sprout::enable_if::value>::type \ > { \ public: \ - SPROUT_STATIC_CONSTEXPR typename std::decay::type ALIAS = T::CONSTANT; \ + SPROUT_STATIC_CONSTEXPR typename sprout::decay::type ALIAS = T::CONSTANT; \ }; \ template \ - SPROUT_CONSTEXPR_OR_CONST typename std::decay::type NAME< \ + SPROUT_CONSTEXPR_OR_CONST typename sprout::decay::type NAME< \ T, \ - typename std::enable_if::value>::type \ + typename sprout::enable_if::value>::type \ >::ALIAS #endif #define SPROUT_INHERIT_ALIAS_IF_XXX_CONSTANT_DEF_LAZY(ALIAS, CONSTANT) \ diff --git a/sprout/type_traits/integral_constant.hpp b/sprout/type_traits/integral_constant.hpp new file mode 100644 index 00000000..47ee3cdd --- /dev/null +++ b/sprout/type_traits/integral_constant.hpp @@ -0,0 +1,43 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_TYPE_TRAITS_INTEGRAL_CONSTANT_HPP +#define SPROUT_TYPE_TRAITS_INTEGRAL_CONSTANT_HPP + +#include +#include + +namespace sprout { + // + // integral_constant + // + template + struct integral_constant + : public std::integral_constant + { + public: + typedef typename std::integral_constant::value_type value_type; + typedef integral_constant type; + public: + SPROUT_CONSTEXPR + operator value_type() const SPROUT_NOEXCEPT { + return std::integral_constant::value; + } + SPROUT_CONSTEXPR value_type + operator()() const SPROUT_NOEXCEPT { + return std::integral_constant::value; + } + }; + // + // true_type + // false_type + // + typedef sprout::integral_constant true_type; + typedef sprout::integral_constant false_type; +} // namespace sprout + +#endif // #ifndef SPROUT_TYPE_TRAITS_INTEGRAL_CONSTANT_HPP diff --git a/sprout/type_traits/is_c_str.hpp b/sprout/type_traits/is_c_str.hpp index 6ab8e390..a898ca4b 100644 --- a/sprout/type_traits/is_c_str.hpp +++ b/sprout/type_traits/is_c_str.hpp @@ -8,8 +8,9 @@ #ifndef SPROUT_TYPE_TRAITS_IS_C_STR_HPP #define SPROUT_TYPE_TRAITS_IS_C_STR_HPP -#include +#include #include +#include namespace sprout { // @@ -17,7 +18,7 @@ namespace sprout { // template struct is_c_str - : public std::false_type + : public sprout::false_type {}; template struct is_c_str @@ -37,15 +38,15 @@ namespace sprout { {}; template struct is_c_str - : public std::true_type + : public sprout::true_type {}; template struct is_c_str - : public std::true_type + : public sprout::true_type {}; template struct is_c_str - : public std::true_type + : public sprout::true_type {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/is_char_type.hpp b/sprout/type_traits/is_char_type.hpp index cf5a1acb..e75bf636 100644 --- a/sprout/type_traits/is_char_type.hpp +++ b/sprout/type_traits/is_char_type.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_IS_CHAR_TYPE_HPP #define SPROUT_TYPE_TRAITS_IS_CHAR_TYPE_HPP -#include #include +#include namespace sprout { // @@ -17,7 +17,7 @@ namespace sprout { // template struct is_char_type - : public std::false_type + : public sprout::false_type {}; template struct is_char_type @@ -33,19 +33,19 @@ namespace sprout { {}; template<> struct is_char_type - : public std::true_type + : public sprout::true_type {}; template<> struct is_char_type - : public std::true_type + : public sprout::true_type {}; template<> struct is_char_type - : public std::true_type + : public sprout::true_type {}; template<> struct is_char_type - : public std::true_type + : public sprout::true_type {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/is_convert_constructible.hpp b/sprout/type_traits/is_convert_constructible.hpp index cf8ff1de..616ae653 100644 --- a/sprout/type_traits/is_convert_constructible.hpp +++ b/sprout/type_traits/is_convert_constructible.hpp @@ -9,8 +9,8 @@ #define SPROUT_TYPE_TRAITS_IS_CONVERT_CONSTRUCTIBLE_HPP #include -#include #include +#include namespace sprout { // @@ -21,8 +21,8 @@ namespace sprout { struct is_convert_constructible_test { public: template - static std::true_type test(To); - static std::false_type test(...); + static sprout::true_type test(To); + static sprout::false_type test(...); }; } // namespace detail template diff --git a/sprout/type_traits/is_int.hpp b/sprout/type_traits/is_int.hpp index 14fee90a..c1138b5b 100644 --- a/sprout/type_traits/is_int.hpp +++ b/sprout/type_traits/is_int.hpp @@ -1,3 +1,4 @@ +#include /*============================================================================= Copyright (c) 2011-2013 Bolero MURAKAMI https://github.com/bolero-MURAKAMI/Sprout @@ -8,8 +9,9 @@ #ifndef SPROUT_TYPE_TRAITS_IS_INT_HPP #define SPROUT_TYPE_TRAITS_IS_INT_HPP -#include #include +#include +#include namespace sprout { // @@ -17,9 +19,9 @@ namespace sprout { // template struct is_int - : public std::integral_constant< + : public sprout::integral_constant< bool, - std::is_integral::value && std::is_signed::value + sprout::is_integral::value && sprout::is_signed::value > {}; diff --git a/sprout/type_traits/is_uint.hpp b/sprout/type_traits/is_uint.hpp index fb6a3cc3..8ff75793 100644 --- a/sprout/type_traits/is_uint.hpp +++ b/sprout/type_traits/is_uint.hpp @@ -8,8 +8,9 @@ #ifndef SPROUT_TYPE_TRAITS_IS_UINT_HPP #define SPROUT_TYPE_TRAITS_IS_UINT_HPP -#include #include +#include +#include namespace sprout { // @@ -17,9 +18,9 @@ namespace sprout { // template struct is_uint - : public std::integral_constant< + : public sprout::integral_constant< bool, - std::is_integral::value && std::is_unsigned::value + sprout::is_integral::value && sprout::is_unsigned::value > {}; diff --git a/sprout/type_traits/remove_cvref.hpp b/sprout/type_traits/remove_cvref.hpp index f9c97765..80273c8f 100644 --- a/sprout/type_traits/remove_cvref.hpp +++ b/sprout/type_traits/remove_cvref.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_CVREF_HPP #define SPROUT_TYPE_TRAITS_REMOVE_CVREF_HPP -#include #include +#include namespace sprout { // @@ -17,8 +17,8 @@ namespace sprout { // template struct remove_cvref - : public std::remove_cv< - typename std::remove_reference::type + : public sprout::remove_cv< + typename sprout::remove_reference::type > {}; diff --git a/sprout/type_traits/remove_shallow_const.hpp b/sprout/type_traits/remove_shallow_const.hpp index 0b6ef7f1..83856ebd 100644 --- a/sprout/type_traits/remove_shallow_const.hpp +++ b/sprout/type_traits/remove_shallow_const.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CONST_HPP #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CONST_HPP -#include #include +#include #include namespace sprout { @@ -22,7 +22,7 @@ namespace sprout { {}; template struct remove_shallow_const - : public std::conditional::value, T const, T> + : public sprout::conditional::value, T const, T> {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/remove_shallow_cv.hpp b/sprout/type_traits/remove_shallow_cv.hpp index e7350b83..0142242a 100644 --- a/sprout/type_traits/remove_shallow_cv.hpp +++ b/sprout/type_traits/remove_shallow_cv.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CV_HPP #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CV_HPP -#include #include +#include #include namespace sprout { @@ -22,15 +22,15 @@ namespace sprout { {}; template struct remove_shallow_cv - : public std::conditional::value, T const, T> + : public sprout::conditional::value, T const, T> {}; template struct remove_shallow_cv - : public std::conditional::value, T volatile, T> + : public sprout::conditional::value, T volatile, T> {}; template struct remove_shallow_cv - : public std::conditional::value, T const volatile, T> + : public sprout::conditional::value, T const volatile, T> {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/remove_shallow_cvref.hpp b/sprout/type_traits/remove_shallow_cvref.hpp index 36a1dbdf..64b4e1c6 100644 --- a/sprout/type_traits/remove_shallow_cvref.hpp +++ b/sprout/type_traits/remove_shallow_cvref.hpp @@ -8,7 +8,6 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CVREF_HPP #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CVREF_HPP -#include #include #include @@ -19,7 +18,7 @@ namespace sprout { template struct remove_shallow_cvref : public sprout::remove_shallow_cv< - typename std::remove_reference::type + typename sprout::remove_reference::type > {}; diff --git a/sprout/type_traits/remove_shallow_volatile.hpp b/sprout/type_traits/remove_shallow_volatile.hpp index d216ce0d..e732872a 100644 --- a/sprout/type_traits/remove_shallow_volatile.hpp +++ b/sprout/type_traits/remove_shallow_volatile.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_VOLATILE_HPP #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_VOLATILE_HPP -#include #include +#include #include namespace sprout { @@ -22,7 +22,7 @@ namespace sprout { {}; template struct remove_shallow_volatile - : public std::conditional::value, T volatile, T> + : public sprout::conditional::value, T volatile, T> {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/std.hpp b/sprout/type_traits/std.hpp new file mode 100644 index 00000000..d52e17a0 --- /dev/null +++ b/sprout/type_traits/std.hpp @@ -0,0 +1,16 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_TYPE_TRAITS_STD_HPP +#define SPROUT_TYPE_TRAITS_STD_HPP + +#include +#include +#include +#include + +#endif // #ifndef SPROUT_TYPE_TRAITS_STD_HPP diff --git a/sprout/type_traits/std_type_aliases.hpp b/sprout/type_traits/std_type_aliases.hpp new file mode 100644 index 00000000..7cf3d8ba --- /dev/null +++ b/sprout/type_traits/std_type_aliases.hpp @@ -0,0 +1,90 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_TYPE_TRAITS_STD_TYPE_ALIASES_HPP +#define SPROUT_TYPE_TRAITS_STD_TYPE_ALIASES_HPP + +#include +#if SPROUT_USE_TEMPLATE_ALIASES +# include +# include +#endif // #if SPROUT_USE_TEMPLATE_ALIASES + +namespace sprout { +#if SPROUT_USE_TEMPLATE_ALIASES + // Copyright (c) 2011 osyo-manga : http://d.hatena.ne.jp/osyo-manga/ + + // 20.10.7.1 Const-volatile modifications + + template + using remove_const_t = typename sprout::remove_const::type; + template + using remove_volatile_t = typename sprout::remove_volatile::type; + template + using remove_cv_t = typename sprout::remove_cv::type; + template + using add_const_t = typename sprout::add_const::type; + template + using add_volatile_t = typename sprout::add_volatile::type; + template + using add_cv_t = typename sprout::add_cv::type; + + // 20.10.7.2 Reference modifications + + template + using remove_reference_t = typename sprout::remove_reference::type; + template + using add_lvalue_reference_t = typename sprout::add_lvalue_reference::type; + template + using add_rvalue_reference_t = typename sprout::add_rvalue_reference::type; + + // 20.10.7.3 Sign modifications + + template + using make_signed_t = typename sprout::make_signed::type; + template + using make_unsigned_t = typename sprout::make_unsigned::type; + + // 20.10.7.4 Array modifications + + template + using remove_extent_t = typename sprout::remove_extent::type; + template + using remove_all_extents_t = typename sprout::remove_all_extents::type; + + // 20.10.7.5 Pointer modifications + + template + using remove_pointer_t = typename sprout::remove_pointer::type; + template + using add_pointer_t = typename sprout::add_pointer::type; + + // 20.10.7.6 Other transformations + + template< + std::size_t Len, + std::size_t Align = sprout::alignment_of::type>::value + > + using aligned_storage_t = typename sprout::aligned_storage::type; + template + using aligned_union_t = typename sprout::aligned_union::type; + template + using decay_t = typename sprout::decay::type; + template + using enable_if_t = typename sprout::enable_if::type; + template + using conditional_t = typename sprout::conditional::type; + template + using common_type_t = typename sprout::common_type::type; + template + using underlying_type_t = typename sprout::underlying_type::type; + template + using result_of_t = typename sprout::result_of::type; +#endif // #if SPROUT_USE_TEMPLATE_ALIASES +} // namespace sprout + +#endif // #ifndef SPROUT_TYPE_TRAITS_STD_TYPE_ALIASES_HPP diff --git a/sprout/type_traits/std_type_traits.hpp b/sprout/type_traits/std_type_traits.hpp new file mode 100644 index 00000000..748452ff --- /dev/null +++ b/sprout/type_traits/std_type_traits.hpp @@ -0,0 +1,479 @@ +/*============================================================================= + Copyright (c) 2011-2013 Bolero MURAKAMI + https://github.com/bolero-MURAKAMI/Sprout + + Distributed under the Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +=============================================================================*/ +#ifndef SPROUT_TYPE_TRAITS_STD_TYPE_TRAITS_HPP +#define SPROUT_TYPE_TRAITS_STD_TYPE_TRAITS_HPP + +#include +#include +#include +#include +#include +#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION < 1101) +# include +#endif + +namespace sprout { + + // 20.10.4.1 Primary type categories + + template + struct is_void + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_null_pointer + : public sprout::detail::type_traits_wrapper::type, std::nullptr_t> > + {}; + template + struct is_integral + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_floating_point + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_array + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_pointer + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_lvalue_reference + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_rvalue_reference + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_member_object_pointer + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_member_function_pointer + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_enum + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_union + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_class + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_function + : public sprout::detail::type_traits_wrapper > + {}; + + // 20.10.4.2 Composite type traits + + template + struct is_reference + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_arithmetic + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_fundamental + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_object + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_scalar + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_compound + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_member_pointer + : public sprout::detail::type_traits_wrapper > + {}; + + // 20.10.4.3 Type properties + + template + struct is_const + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_volatile + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_trivial + : public sprout::detail::type_traits_wrapper > + {}; +#if !defined(_LIBCPP_VERSION) + template + struct is_trivially_copyable + : public sprout::is_scalar::type> + {}; +#else + template + struct is_trivially_copyable + : public sprout::detail::type_traits_wrapper > + {}; +#endif + template + struct is_standard_layout + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_pod + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_literal_type + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_empty + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_polymorphic + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_abstract + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_signed + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_unsigned + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_default_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_copy_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_move_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_assignable + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_copy_assignable + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_move_assignable + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_destructible + : public sprout::detail::type_traits_wrapper > + {}; +#if !defined(_LIBCPP_VERSION) +#if SPROUT_CLANG_HAS_FUTURE(is_trivially_constructible) + template + struct is_trivially_constructible + : public sprout::integral_constant + {}; +#else // #if SPROUT_CLANG_HAS_FUTURE(is_trivially_constructible) + template + struct is_trivially_constructible + : public sprout::false_type + {}; +#if SPROUT_CLANG_HAS_FUTURE(has_trivial_constructor) || SPROUT_GCC_GREATER_EQUAL(4, 3, 0) + template + struct is_trivially_constructible + : public sprout::integral_constant + {}; +#else // #if SPROUT_CLANG_HAS_FUTURE(has_trivial_constructor) || SPROUT_GCC_GREATER_EQUAL(4, 3, 0) + template + struct is_trivially_constructible + : public sprout::is_scalar + {}; +#endif // #if SPROUT_CLANG_HAS_FUTURE(has_trivial_constructor) || SPROUT_GCC_GREATER_EQUAL(4, 3, 0) + template + struct is_trivially_constructible + : public sprout::is_scalar + {}; + template + struct is_trivially_constructible + : public sprout::is_scalar + {}; + template + struct is_trivially_constructible + : public sprout::is_scalar + {}; + template + struct is_trivially_constructible + : public sprout::is_scalar + {}; +#endif // #if SPROUT_CLANG_HAS_FUTURE(is_trivially_constructible) + template + struct is_trivially_default_constructible + : public sprout::is_trivially_constructible + {}; + template + struct is_trivially_copy_constructible + : public sprout::is_trivially_constructible::type const> + {}; + template + struct is_trivially_move_constructible + : public sprout::is_trivially_constructible::type const> + {}; +#if SPROUT_CLANG_HAS_FUTURE(is_trivially_assignable) + template + struct is_trivially_assignable + : public sprout::integral_constant + {}; +#else // #if SPROUT_CLANG_HAS_FUTURE(is_trivially_assignable) + template + struct is_trivially_assignable + : public sprout::false_type + {}; + template + struct is_trivially_assignable + : public sprout::is_scalar + {}; + template + struct is_trivially_assignable + : public sprout::is_scalar + {}; + template + struct is_trivially_assignable + : public sprout::is_scalar + {}; + template + struct is_trivially_assignable + : public sprout::is_scalar + {}; + template + struct is_trivially_assignable + : public sprout::is_scalar + {}; +#endif // #if SPROUT_CLANG_HAS_FUTURE(is_trivially_assignable) + template + struct is_trivially_copy_assignable + : public sprout::is_trivially_assignable< + typename std::add_lvalue_reference::type, + typename std::add_lvalue_reference::type const + > + {}; + template + struct is_trivially_move_assignable + : public sprout::is_trivially_assignable< + typename std::add_lvalue_reference::type, + typename std::add_rvalue_reference::type + > + {}; +#else // #if !defined(_LIBCPP_VERSION) + template + struct is_trivially_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_trivially_default_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_trivially_copy_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_trivially_move_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_trivially_assignable + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_trivially_copy_assignable + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_trivially_move_assignable + : public sprout::detail::type_traits_wrapper > + {}; +#endif // #if !defined(_LIBCPP_VERSION) +#if !defined(_LIBCPP_VERSION) && SPROUT_GCC_LESS(4, 8, 0) +#if SPROUT_CLANG_HAS_FUTURE(has_trivial_destructor) || SPROUT_GCC_GREATER_EQUAL(4, 3, 0) + template + struct is_trivially_destructible + : public sprout::integral_constant + {}; +#else // #if SPROUT_CLANG_HAS_FUTURE(has_trivial_destructor) || SPROUT_GCC_GREATER_EQUAL(4, 3, 0) + template + struct is_trivially_destructible + : public sprout::integral_constant< + bool, + sprout::is_scalar::type>::value + || sprout::is_reference::type>::value + > + {}; +#endif // #if SPROUT_CLANG_HAS_FUTURE(has_trivial_destructor) || SPROUT_GCC_GREATER_EQUAL(4, 3, 0) +#else // #if !defined(_LIBCPP_VERSION) && SPROUT_GCC_LESS(4, 8, 0) + template + struct is_trivially_destructible + : public sprout::detail::type_traits_wrapper > + {}; +#endif // #if !defined(_LIBCPP_VERSION) && SPROUT_GCC_LESS(4, 8, 0) + template + struct is_nothrow_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_nothrow_default_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_nothrow_copy_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_nothrow_move_constructible + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_nothrow_assignable + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_nothrow_copy_assignable + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_nothrow_move_assignable + : public sprout::detail::type_traits_wrapper > + {}; +#if !defined(_LIBCPP_VERSION) && SPROUT_GCC_LESS(4, 8, 0) + template + struct is_nothrow_destructible + : public sprout::integral_constant< + bool, + sprout::is_scalar::type>::value + || sprout::is_reference::type>::value + > + {}; +#else // #if !defined(_LIBCPP_VERSION) && SPROUT_GCC_LESS(4, 8, 0) + template + struct is_nothrow_destructible + : public sprout::detail::type_traits_wrapper > + {}; +#endif // #if !defined(_LIBCPP_VERSION) && SPROUT_GCC_LESS(4, 8, 0) + template + struct has_virtual_destructor + : public sprout::detail::type_traits_wrapper > + {}; + + // 20.10.5 Type property queries + + template + struct alignment_of + : public sprout::detail::type_traits_wrapper > + {}; + template + struct rank + : public sprout::detail::type_traits_wrapper > + {}; + template + struct extent + : public sprout::detail::type_traits_wrapper > + {}; + + // 20.10.6 Relationships between types + + template + struct is_same + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_base_of + : public sprout::detail::type_traits_wrapper > + {}; + template + struct is_convertible + : public sprout::detail::type_traits_wrapper > + {}; + + // 20.10.7.1 Const-volatile modifications + + using std::remove_const; + using std::remove_volatile; + using std::remove_cv; + using std::add_const; + using std::add_volatile; + using std::add_cv; + + // 20.10.7.2 Reference modifications + + using std::remove_reference; + using std::add_lvalue_reference; + using std::add_rvalue_reference; + + // 20.10.7.3 Sign modifications + + using std::make_signed; + using std::make_unsigned; + + // 20.10.7.4 Array modifications + + using std::remove_extent; + using std::remove_all_extents; + + // 20.10.7.5 Pointer modifications + + using std::remove_pointer; + using std::add_pointer; + + // 20.10.7.6 Other transformations + + using std::aligned_storage; +#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION < 1101) + template + struct aligned_union + : public sprout::aligned_storage< + sprout::tpp::max_element_c::value, + sprout::tpp::max_element_c::value...>::value + > + {}; +#else // #if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION < 1101) + using std::aligned_union; +#endif // #if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION < 1101) + using std::decay; + using std::enable_if; + using std::conditional; + using std::common_type; + using std::underlying_type; + using std::result_of; +} // namespace sprout + +#endif // #ifndef SPROUT_TYPE_TRAITS_STD_TYPE_TRAITS_HPP diff --git a/sprout/utility/pair/pair.hpp b/sprout/utility/pair/pair.hpp index 15135a06..6ffeb454 100644 --- a/sprout/utility/pair/pair.hpp +++ b/sprout/utility/pair/pair.hpp @@ -21,8 +21,8 @@ namespace sprout { // // pair // - template - template + template + template inline SPROUT_CONSTEXPR sprout::pair::pair( sprout::tuples::tuple first_args, sprout::tuples::tuple second_args, sprout::index_tuple, sprout::index_tuple @@ -31,7 +31,7 @@ namespace sprout { , second(sprout::tuples::get(second_args)...) {} #if SPROUT_USE_DELEGATING_CONSTRUCTORS - template + template template< typename... Args1, typename... Args2, typename @@ -48,7 +48,7 @@ namespace sprout { ) {} #endif // #if SPROUT_USE_DELEGATING_CONSTRUCTORS - template + template template< typename U, typename V, typename @@ -57,7 +57,7 @@ namespace sprout { : first(sprout::tuples::get<0>(other)) , second(sprout::tuples::get<1>(other)) {} - template + template template< typename U, typename V, typename @@ -67,7 +67,7 @@ namespace sprout { , second(sprout::forward(sprout::tuples::get<1>(other))) {} - template + template template< typename U, typename V, typename @@ -77,7 +77,7 @@ namespace sprout { second = sprout::tuples::get<0>(rhs); return *this; } - template + template template< typename U, typename V, typename diff --git a/sprout/utility/pair/pair_decl.hpp b/sprout/utility/pair/pair_decl.hpp index 86f15c1f..f0cf07ea 100644 --- a/sprout/utility/pair/pair_decl.hpp +++ b/sprout/utility/pair/pair_decl.hpp @@ -21,7 +21,7 @@ namespace sprout { // // pair // - template + template struct pair { public: typedef T1 first_type; @@ -30,7 +30,7 @@ namespace sprout { T1 first; T2 second; private: - template + template SPROUT_CONSTEXPR pair( sprout::tuples::tuple first_args, sprout::tuples::tuple second_args, sprout::index_tuple, sprout::index_tuple diff --git a/sprout/utility/pair/pair_fwd.hpp b/sprout/utility/pair/pair_fwd.hpp index 6857d7bc..e5fffb13 100644 --- a/sprout/utility/pair/pair_fwd.hpp +++ b/sprout/utility/pair/pair_fwd.hpp @@ -14,7 +14,7 @@ namespace sprout { // // pair // - template + template struct pair; } // namespace sprout diff --git a/sprout/utility/rel_ops.hpp b/sprout/utility/rel_ops.hpp index 4dd8283b..a8127d62 100644 --- a/sprout/utility/rel_ops.hpp +++ b/sprout/utility/rel_ops.hpp @@ -15,7 +15,7 @@ namespace sprout { // // operator!= // - template + template inline SPROUT_CONSTEXPR bool operator!=(T const& x, T const& y) { return !(x == y); @@ -23,7 +23,7 @@ namespace sprout { // // operator> // - template + template inline SPROUT_CONSTEXPR bool operator>(T const& x, T const& y) { return y < x; @@ -31,7 +31,7 @@ namespace sprout { // // operator<= // - template + template inline SPROUT_CONSTEXPR bool operator<=(T const& x, T const& y) { return !(y < x); @@ -39,7 +39,7 @@ namespace sprout { // // operator>= // - template + template inline SPROUT_CONSTEXPR bool operator>=(T const& x, T const& y) { return !(x < y); diff --git a/sprout/variant/get.hpp b/sprout/variant/get.hpp index bc5c5f54..153cbef6 100644 --- a/sprout/variant/get.hpp +++ b/sprout/variant/get.hpp @@ -17,15 +17,15 @@ namespace sprout { // // get // - template - inline SPROUT_CONSTEXPR U const& + template + inline SPROUT_CONSTEXPR T const& get(sprout::variant const& operand) { - return operand.template get(); + return operand.template get(); } - template - inline SPROUT_CONSTEXPR U& + template + inline SPROUT_CONSTEXPR T& get(sprout::variant& operand) { - return operand.template get(); + return operand.template get(); } } // namespace sprout diff --git a/sprout/weed/attr_cnv/bitwise_or.hpp b/sprout/weed/attr_cnv/bitwise_or.hpp index b41ca02f..bedd11b5 100644 --- a/sprout/weed/attr_cnv/bitwise_or.hpp +++ b/sprout/weed/attr_cnv/bitwise_or.hpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace sprout { namespace weed { @@ -36,9 +36,9 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_same_container::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::fixed::realign_to(x); } // container | V -> container @@ -46,18 +46,18 @@ namespace sprout { inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_container_and_elem::value && sprout::weed::traits::is_container::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::fixed::realign_to(x); } template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_container_and_elem::value && !sprout::weed::traits::is_container::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::make(x); } // V | container -> container @@ -65,34 +65,34 @@ namespace sprout { inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_elem_and_container::value && sprout::weed::traits::is_container::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::fixed::realign_to(x); } template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_elem_and_container::value && !sprout::weed::traits::is_container::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::make(x); } // tuple | tuple -> tuple template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_both_tuple::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::tuples::copy(type(), x); } // V | V -> V template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_same_elem::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { return x; } @@ -100,27 +100,27 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_different_elem::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - return typename sprout::weed::attr_cnv::result_of::bitwise_or::type(x); + return typename sprout::weed::attr_cnv::results::bitwise_or::type(x); } // V | unused -> container template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_elem_and_unused::value && !sprout::weed::traits::is_unused::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::make(x); } template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_elem_and_unused::value && sprout::weed::traits::is_unused::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const&) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::make(); } // unused | V -> container @@ -128,25 +128,25 @@ namespace sprout { inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_unused_and_elem::value && !sprout::weed::traits::is_unused::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const& x) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::make(x); } template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_unused_and_elem::value && sprout::weed::traits::is_unused::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const&) { - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or::type type; + typedef typename sprout::weed::attr_cnv::results::bitwise_or::type type; return sprout::make(); } // unused | unused -> unused template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_both_unused::value, - typename sprout::weed::attr_cnv::result_of::bitwise_or::type + typename sprout::weed::attr_cnv::results::bitwise_or::type >::type bitwise_or(X const&) { return sprout::weed::unused(); } diff --git a/sprout/weed/attr_cnv/mem_ptr.hpp b/sprout/weed/attr_cnv/mem_ptr.hpp index 71072902..80f5d616 100644 --- a/sprout/weed/attr_cnv/mem_ptr.hpp +++ b/sprout/weed/attr_cnv/mem_ptr.hpp @@ -9,7 +9,7 @@ #define SPROUT_WEED_ATTR_CNV_MEM_PTR_HPP #include -#include +#include namespace sprout { namespace weed { @@ -18,7 +18,7 @@ namespace sprout { // mem_ptr // template - inline SPROUT_CONSTEXPR typename sprout::weed::attr_cnv::result_of::mem_ptr::type + inline SPROUT_CONSTEXPR typename sprout::weed::attr_cnv::results::mem_ptr::type mem_ptr(T const& t, U const& u) { return u(t); } diff --git a/sprout/weed/attr_cnv/modulus.hpp b/sprout/weed/attr_cnv/modulus.hpp index 98ac02bc..92f0bdaa 100644 --- a/sprout/weed/attr_cnv/modulus.hpp +++ b/sprout/weed/attr_cnv/modulus.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace sprout { @@ -20,7 +20,7 @@ namespace sprout { // modulus // template - inline SPROUT_CONSTEXPR typename sprout::weed::attr_cnv::result_of::modulus::type + inline SPROUT_CONSTEXPR typename sprout::weed::attr_cnv::results::modulus::type modulus(Args const&... args) { return sprout::weed::attr_cnv::times(args...); } diff --git a/sprout/weed/attr_cnv/negate.hpp b/sprout/weed/attr_cnv/negate.hpp index 58d5370d..7418aba5 100644 --- a/sprout/weed/attr_cnv/negate.hpp +++ b/sprout/weed/attr_cnv/negate.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace sprout { namespace weed { @@ -24,7 +24,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::traits::is_unused::value, - typename sprout::weed::attr_cnv::result_of::negate::type + typename sprout::weed::attr_cnv::results::negate::type >::type negate(T const&, bool) { return sprout::weed::unused(); } diff --git a/sprout/weed/attr_cnv/result_of.hpp b/sprout/weed/attr_cnv/results.hpp similarity index 62% rename from sprout/weed/attr_cnv/result_of.hpp rename to sprout/weed/attr_cnv/results.hpp index 2b6a596a..82957ed3 100644 --- a/sprout/weed/attr_cnv/result_of.hpp +++ b/sprout/weed/attr_cnv/results.hpp @@ -9,11 +9,11 @@ #define SPROUT_WEED_ATTR_CNV_RESULT_OF_HPP #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #endif // #ifndef SPROUT_WEED_ATTR_CNV_RESULT_OF_HPP diff --git a/sprout/weed/attr_cnv/result_of/bitwise_or.hpp b/sprout/weed/attr_cnv/results/bitwise_or.hpp similarity index 95% rename from sprout/weed/attr_cnv/result_of/bitwise_or.hpp rename to sprout/weed/attr_cnv/results/bitwise_or.hpp index d8380b83..04a2b356 100644 --- a/sprout/weed/attr_cnv/result_of/bitwise_or.hpp +++ b/sprout/weed/attr_cnv/results/bitwise_or.hpp @@ -30,7 +30,7 @@ namespace sprout { namespace weed { namespace attr_cnv { - namespace result_of { + namespace results { // // bitwise_or // @@ -159,7 +159,7 @@ namespace sprout { > : public sprout::identity {}; - } // namespace result_of + } // namespace results } // namespace attr_cnv } // namespace weed } // namespace sprout diff --git a/sprout/weed/attr_cnv/result_of/mem_ptr.hpp b/sprout/weed/attr_cnv/results/mem_ptr.hpp similarity index 91% rename from sprout/weed/attr_cnv/result_of/mem_ptr.hpp rename to sprout/weed/attr_cnv/results/mem_ptr.hpp index 99a44978..1be45a21 100644 --- a/sprout/weed/attr_cnv/result_of/mem_ptr.hpp +++ b/sprout/weed/attr_cnv/results/mem_ptr.hpp @@ -14,7 +14,7 @@ namespace sprout { namespace weed { namespace attr_cnv { - namespace result_of { + namespace results { // // mem_ptr // @@ -22,7 +22,7 @@ namespace sprout { struct mem_ptr : public std::result_of {}; - } // namespace result_of + } // namespace results } // namespace attr_cnv } // namespace weed } // namespace sprout diff --git a/sprout/weed/attr_cnv/result_of/modulus.hpp b/sprout/weed/attr_cnv/results/modulus.hpp similarity index 81% rename from sprout/weed/attr_cnv/result_of/modulus.hpp rename to sprout/weed/attr_cnv/results/modulus.hpp index 04580de3..f918d733 100644 --- a/sprout/weed/attr_cnv/result_of/modulus.hpp +++ b/sprout/weed/attr_cnv/results/modulus.hpp @@ -10,20 +10,20 @@ #include #include -#include +#include namespace sprout { namespace weed { namespace attr_cnv { - namespace result_of { + namespace results { // // modulus // template struct modulus - : public sprout::weed::attr_cnv::result_of::times + : public sprout::weed::attr_cnv::results::times {}; - } // namespace result_of + } // namespace results } // namespace attr_cnv } // namespace weed } // namespace sprout diff --git a/sprout/weed/attr_cnv/result_of/negate.hpp b/sprout/weed/attr_cnv/results/negate.hpp similarity index 92% rename from sprout/weed/attr_cnv/result_of/negate.hpp rename to sprout/weed/attr_cnv/results/negate.hpp index e552e21d..0469e5ee 100644 --- a/sprout/weed/attr_cnv/result_of/negate.hpp +++ b/sprout/weed/attr_cnv/results/negate.hpp @@ -17,7 +17,7 @@ namespace sprout { namespace weed { namespace attr_cnv { - namespace result_of { + namespace results { // // negate // @@ -33,7 +33,7 @@ namespace sprout { > : public sprout::identity {}; - } // namespace result_of + } // namespace results } // namespace attr_cnv } // namespace weed } // namespace sprout diff --git a/sprout/weed/attr_cnv/result_of/shift_left.hpp b/sprout/weed/attr_cnv/results/shift_left.hpp similarity index 89% rename from sprout/weed/attr_cnv/result_of/shift_left.hpp rename to sprout/weed/attr_cnv/results/shift_left.hpp index ddcd2d8a..afcf0896 100644 --- a/sprout/weed/attr_cnv/result_of/shift_left.hpp +++ b/sprout/weed/attr_cnv/results/shift_left.hpp @@ -36,7 +36,7 @@ namespace sprout { namespace weed { namespace attr_cnv { - namespace result_of { + namespace results { // // shift_left // @@ -51,7 +51,7 @@ namespace sprout { sprout::weed::detail::is_same_container::value >::type > - : public sprout::fixed::result_of::append_back + : public sprout::fixed::results::append_back {}; // container >> V -> container template @@ -62,7 +62,7 @@ namespace sprout { sprout::weed::detail::is_container_and_elem::value >::type > - : public sprout::fixed::result_of::push_back + : public sprout::fixed::results::push_back {}; // V >> container -> container template @@ -73,7 +73,7 @@ namespace sprout { sprout::weed::detail::is_elem_and_container::value >::type > - : public sprout::fixed::result_of::push_front + : public sprout::fixed::results::push_front {}; // tuple >> tuple -> tuple template @@ -84,7 +84,7 @@ namespace sprout { sprout::weed::detail::is_both_tuple::value >::type > - : public sprout::tuples::result_of::append_back + : public sprout::tuples::results::append_back {}; // tuple >> V -> tuple template @@ -95,7 +95,7 @@ namespace sprout { sprout::weed::detail::is_tuple_and_elem::value >::type > - : public sprout::tuples::result_of::push_back + : public sprout::tuples::results::push_back {}; // V >> tuple -> tuple template @@ -106,7 +106,7 @@ namespace sprout { sprout::weed::detail::is_elem_and_tuple::value >::type > - : public sprout::tuples::result_of::push_front + : public sprout::tuples::results::push_front {}; // V >> V -> container template @@ -167,7 +167,7 @@ namespace sprout { > : public sprout::identity {}; - } // namespace result_of + } // namespace results } // namespace attr_cnv } // namespace weed } // namespace sprout diff --git a/sprout/weed/attr_cnv/result_of/times.hpp b/sprout/weed/attr_cnv/results/times.hpp similarity index 92% rename from sprout/weed/attr_cnv/result_of/times.hpp rename to sprout/weed/attr_cnv/results/times.hpp index 45d32298..e321e80c 100644 --- a/sprout/weed/attr_cnv/result_of/times.hpp +++ b/sprout/weed/attr_cnv/results/times.hpp @@ -23,7 +23,7 @@ namespace sprout { namespace weed { namespace attr_cnv { - namespace result_of { + namespace results { // // times // @@ -39,7 +39,7 @@ namespace sprout { && sprout::weed::traits::is_container::value >::type > - : public sprout::algorithm::result_of::join< + : public sprout::algorithm::results::join< sprout::array > {}; @@ -71,7 +71,7 @@ namespace sprout { > : public sprout::identity {}; - } // namespace result_of + } // namespace results } // namespace attr_cnv } // namespace weed } // namespace sprout diff --git a/sprout/weed/attr_cnv/shift_left.hpp b/sprout/weed/attr_cnv/shift_left.hpp index 4b80e3f3..227a4b8c 100644 --- a/sprout/weed/attr_cnv/shift_left.hpp +++ b/sprout/weed/attr_cnv/shift_left.hpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include namespace sprout { namespace weed { @@ -40,7 +40,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_same_container::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { return sprout::fixed::append_back(t, u); } @@ -48,7 +48,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_container_and_elem::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { return sprout::fixed::push_back(t, u); } @@ -56,7 +56,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_elem_and_container::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { return sprout::fixed::push_front(u, t); } @@ -64,7 +64,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_both_tuple::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { return sprout::tuples::append_back(t, u); } @@ -72,7 +72,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_tuple_and_elem::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { return sprout::tuples::push_back(t, u); } @@ -80,7 +80,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_elem_and_tuple::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { return sprout::tuples::push_front(u, t); } @@ -88,24 +88,24 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_same_elem::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { - typedef typename sprout::weed::attr_cnv::result_of::shift_left::type type; + typedef typename sprout::weed::attr_cnv::results::shift_left::type type; return sprout::make(t, u); } // V >> W -> tuple template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_different_elem::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const& u) { - return typename sprout::weed::attr_cnv::result_of::shift_left::type(t, u); + return typename sprout::weed::attr_cnv::results::shift_left::type(t, u); } // V >> unused -> V template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_elem_and_unused::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const& t, U const&) { return t; } @@ -113,7 +113,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_unused_and_elem::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const&, U const& u) { return u; } @@ -121,7 +121,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::detail::is_both_unused::value, - typename sprout::weed::attr_cnv::result_of::shift_left::type + typename sprout::weed::attr_cnv::results::shift_left::type >::type shift_left(T const&, U const&) { return sprout::weed::unused(); } diff --git a/sprout/weed/attr_cnv/times.hpp b/sprout/weed/attr_cnv/times.hpp index 30e49f7c..4aa2813d 100644 --- a/sprout/weed/attr_cnv/times.hpp +++ b/sprout/weed/attr_cnv/times.hpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include namespace sprout { namespace weed { @@ -29,7 +29,7 @@ namespace sprout { template static SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::traits::is_container::value, - typename sprout::weed::attr_cnv::result_of::times::type + typename sprout::weed::attr_cnv::results::times::type >::type times(Args const&... args) { return sprout::algorithm::join( sprout::make >(args...) @@ -40,16 +40,16 @@ namespace sprout { static SPROUT_CONSTEXPR typename std::enable_if< !sprout::weed::traits::is_container::value && !sprout::weed::traits::is_unused::value, - typename sprout::weed::attr_cnv::result_of::times::type + typename sprout::weed::attr_cnv::results::times::type >::type times(Args const&... args) { - typedef typename sprout::weed::attr_cnv::result_of::times::type type; + typedef typename sprout::weed::attr_cnv::results::times::type type; return sprout::make(args...); } // times(unused) -> unused template static SPROUT_CONSTEXPR typename std::enable_if< sprout::weed::traits::is_unused::value, - typename sprout::weed::attr_cnv::result_of::times::type + typename sprout::weed::attr_cnv::results::times::type >::type times(Args const&...) { return sprout::weed::unused(); } diff --git a/sprout/weed/context/parse_context/operator/bitwise_or.hpp b/sprout/weed/context/parse_context/operator/bitwise_or.hpp index c99b9c76..c99f1bd3 100644 --- a/sprout/weed/context/parse_context/operator/bitwise_or.hpp +++ b/sprout/weed/context/parse_context/operator/bitwise_or.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ namespace sprout { typedef typename sprout::weed::traits::attribute_of::type attr1_type; typedef typename sprout::weed::traits::attribute_of::type attr2_type; public: - typedef typename sprout::weed::attr_cnv::result_of::bitwise_or< + typedef typename sprout::weed::attr_cnv::results::bitwise_or< typename sprout::weed::traits::attribute_of::type, typename sprout::weed::traits::attribute_of::type >::type attribute_type; diff --git a/sprout/weed/context/parse_context/operator/dereference.hpp b/sprout/weed/context/parse_context/operator/dereference.hpp index 3237e775..17588726 100644 --- a/sprout/weed/context/parse_context/operator/dereference.hpp +++ b/sprout/weed/context/parse_context/operator/dereference.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,7 +44,7 @@ namespace sprout { typedef typename sprout::weed::traits::limit_of::type limit; typedef typename sprout::weed::traits::attribute_of::type attr_type; public: - typedef typename sprout::weed::attr_cnv::result_of::times< + typedef typename sprout::weed::attr_cnv::results::times< limit::value, typename sprout::weed::traits::attribute_of::type >::type attribute_type; diff --git a/sprout/weed/context/parse_context/operator/mem_ptr.hpp b/sprout/weed/context/parse_context/operator/mem_ptr.hpp index e4b2cdac..290701c9 100644 --- a/sprout/weed/context/parse_context/operator/mem_ptr.hpp +++ b/sprout/weed/context/parse_context/operator/mem_ptr.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ namespace sprout { typedef typename sprout::tuples::tuple_element<0, typename Expr::args_type>::type expr1_type; typedef typename sprout::tuples::tuple_element<1, typename Expr::args_type>::type expr2_type; public: - typedef typename sprout::weed::attr_cnv::result_of::mem_ptr< + typedef typename sprout::weed::attr_cnv::results::mem_ptr< typename sprout::weed::traits::attribute_of::type, typename sprout::tuples::tuple_element<0, typename expr2_type::args_type>::type >::type attribute_type; diff --git a/sprout/weed/context/parse_context/operator/modulus.hpp b/sprout/weed/context/parse_context/operator/modulus.hpp index aced39d2..8ec71470 100644 --- a/sprout/weed/context/parse_context/operator/modulus.hpp +++ b/sprout/weed/context/parse_context/operator/modulus.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ namespace sprout { typedef typename sprout::weed::traits::limit_of::type limit; typedef typename sprout::weed::traits::attribute_of::type attr_type; public: - typedef typename sprout::weed::attr_cnv::result_of::modulus< + typedef typename sprout::weed::attr_cnv::results::modulus< limit::value, typename sprout::weed::traits::attribute_of::type >::type attribute_type; diff --git a/sprout/weed/context/parse_context/operator/negate.hpp b/sprout/weed/context/parse_context/operator/negate.hpp index e67ea8a9..7c551d97 100644 --- a/sprout/weed/context/parse_context/operator/negate.hpp +++ b/sprout/weed/context/parse_context/operator/negate.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ namespace sprout { typedef sprout::weed::parse_context context_type; typedef typename sprout::tuples::tuple_element<0, typename Expr::args_type>::type expr_type; public: - typedef typename sprout::weed::attr_cnv::result_of::negate< + typedef typename sprout::weed::attr_cnv::results::negate< typename sprout::weed::traits::attribute_of::type >::type attribute_type; typedef sprout::weed::eval_result result_type; diff --git a/sprout/weed/context/parse_context/operator/shift_left.hpp b/sprout/weed/context/parse_context/operator/shift_left.hpp index 146d3742..14e9281e 100644 --- a/sprout/weed/context/parse_context/operator/shift_left.hpp +++ b/sprout/weed/context/parse_context/operator/shift_left.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ namespace sprout { typedef typename sprout::tuples::tuple_element<0, typename Expr::args_type>::type expr1_type; typedef typename sprout::tuples::tuple_element<1, typename Expr::args_type>::type expr2_type; public: - typedef typename sprout::weed::attr_cnv::result_of::shift_left< + typedef typename sprout::weed::attr_cnv::results::shift_left< typename sprout::weed::traits::attribute_of::type, typename sprout::weed::traits::attribute_of::type >::type attribute_type; diff --git a/sprout/weed/context/parse_context/operator/unary_plus.hpp b/sprout/weed/context/parse_context/operator/unary_plus.hpp index 70c7e474..d245e3fc 100644 --- a/sprout/weed/context/parse_context/operator/unary_plus.hpp +++ b/sprout/weed/context/parse_context/operator/unary_plus.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,7 +44,7 @@ namespace sprout { typedef typename sprout::weed::traits::limit_of::type limit; typedef typename sprout::weed::traits::attribute_of::type attr_type; public: - typedef typename sprout::weed::attr_cnv::result_of::times< + typedef typename sprout::weed::attr_cnv::results::times< limit::value, typename sprout::weed::traits::attribute_of::type >::type attribute_type; diff --git a/sprout/weed/parser/directive/repeat.hpp b/sprout/weed/parser/directive/repeat.hpp index 0ddbf085..a0fa8e47 100644 --- a/sprout/weed/parser/directive/repeat.hpp +++ b/sprout/weed/parser/directive/repeat.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -151,7 +151,7 @@ namespace sprout { public: template struct attribute - : public sprout::weed::attr_cnv::result_of::times< + : public sprout::weed::attr_cnv::results::times< sprout::weed::traits::limit_of::value, typename sprout::weed::traits::attribute_of::type > diff --git a/tools/testspr/test.cpp b/tools/testspr/test.cpp index 65edb26d..3e2f912e 100644 --- a/tools/testspr/test.cpp +++ b/tools/testspr/test.cpp @@ -9,4 +9,4 @@ # include "../../testspr/header_all.hpp" #endif -# include "../../testspr/sprout.cpp" +#include "../../testspr/sprout.cpp"