diff --git a/sprout/algorithm/adjacent_find.hpp b/sprout/algorithm/adjacent_find.hpp index 2cf86c1f..7f0c1821 100644 --- a/sprout/algorithm/adjacent_find.hpp +++ b/sprout/algorithm/adjacent_find.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/all_of.hpp b/sprout/algorithm/all_of.hpp index 899e9f69..99189a9b 100644 --- a/sprout/algorithm/all_of.hpp +++ b/sprout/algorithm/all_of.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/all_of_equal.hpp b/sprout/algorithm/all_of_equal.hpp index 52044c13..54b2e520 100644 --- a/sprout/algorithm/all_of_equal.hpp +++ b/sprout/algorithm/all_of_equal.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/any_of.hpp b/sprout/algorithm/any_of.hpp index 069a94a1..1aae2bf4 100644 --- a/sprout/algorithm/any_of.hpp +++ b/sprout/algorithm/any_of.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/any_of_equal.hpp b/sprout/algorithm/any_of_equal.hpp index 05469673..243f82b5 100644 --- a/sprout/algorithm/any_of_equal.hpp +++ b/sprout/algorithm/any_of_equal.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/count.hpp b/sprout/algorithm/count.hpp index 50b94844..5b0ce271 100644 --- a/sprout/algorithm/count.hpp +++ b/sprout/algorithm/count.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/count_if.hpp b/sprout/algorithm/count_if.hpp index a524059b..c34b2cfa 100644 --- a/sprout/algorithm/count_if.hpp +++ b/sprout/algorithm/count_if.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/equal.hpp b/sprout/algorithm/equal.hpp index 7a6a2c04..3b13d9f1 100644 --- a/sprout/algorithm/equal.hpp +++ b/sprout/algorithm/equal.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include namespace sprout { diff --git a/sprout/algorithm/equal_range.hpp b/sprout/algorithm/equal_range.hpp index 0705b554..631ca78e 100644 --- a/sprout/algorithm/equal_range.hpp +++ b/sprout/algorithm/equal_range.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/find.hpp b/sprout/algorithm/find.hpp index 453c3e14..0d041ba3 100644 --- a/sprout/algorithm/find.hpp +++ b/sprout/algorithm/find.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/find_difference.hpp b/sprout/algorithm/find_difference.hpp index 6d40b075..ceb3ce7b 100644 --- a/sprout/algorithm/find_difference.hpp +++ b/sprout/algorithm/find_difference.hpp @@ -5,9 +5,10 @@ #include #include #include -#include +#include +#include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/find_end.hpp b/sprout/algorithm/find_end.hpp index 06a50dae..04cb79cb 100644 --- a/sprout/algorithm/find_end.hpp +++ b/sprout/algorithm/find_end.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/find_first_of.hpp b/sprout/algorithm/find_first_of.hpp index b5952122..b889ad2e 100644 --- a/sprout/algorithm/find_first_of.hpp +++ b/sprout/algorithm/find_first_of.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/find_if.hpp b/sprout/algorithm/find_if.hpp index 32ddbdf5..ffc8088c 100644 --- a/sprout/algorithm/find_if.hpp +++ b/sprout/algorithm/find_if.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/find_if_not.hpp b/sprout/algorithm/find_if_not.hpp index 4cc74de6..1676aa4a 100644 --- a/sprout/algorithm/find_if_not.hpp +++ b/sprout/algorithm/find_if_not.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/find_intersection.hpp b/sprout/algorithm/find_intersection.hpp index c5f0fde0..a1dfa539 100644 --- a/sprout/algorithm/find_intersection.hpp +++ b/sprout/algorithm/find_intersection.hpp @@ -5,9 +5,10 @@ #include #include #include -#include +#include +#include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/find_symmetric_difference.hpp b/sprout/algorithm/find_symmetric_difference.hpp index 9d1144c7..cec241d0 100644 --- a/sprout/algorithm/find_symmetric_difference.hpp +++ b/sprout/algorithm/find_symmetric_difference.hpp @@ -5,9 +5,10 @@ #include #include #include -#include +#include +#include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/fit/bogo_sort.hpp b/sprout/algorithm/fit/bogo_sort.hpp index f0f61c08..e3519a5f 100644 --- a/sprout/algorithm/fit/bogo_sort.hpp +++ b/sprout/algorithm/fit/bogo_sort.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/bogo_sort_result.hpp b/sprout/algorithm/fit/bogo_sort_result.hpp index 8fe44f6d..208aa8d6 100644 --- a/sprout/algorithm/fit/bogo_sort_result.hpp +++ b/sprout/algorithm/fit/bogo_sort_result.hpp @@ -2,13 +2,15 @@ #define SPROUT_ALGORITHM_FIT_BOGO_SORT_RESULT_HPP #include -#include +#include +#include #include #include #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/bozo_sort.hpp b/sprout/algorithm/fit/bozo_sort.hpp index 3acf4056..66cc4ea2 100644 --- a/sprout/algorithm/fit/bozo_sort.hpp +++ b/sprout/algorithm/fit/bozo_sort.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/bozo_sort_result.hpp b/sprout/algorithm/fit/bozo_sort_result.hpp index 7f18d3e4..0e0cda1e 100644 --- a/sprout/algorithm/fit/bozo_sort_result.hpp +++ b/sprout/algorithm/fit/bozo_sort_result.hpp @@ -2,13 +2,15 @@ #define SPROUT_ALGORITHM_FIT_BOZO_SORT_RESULT_HPP #include -#include +#include +#include #include #include #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/clamp_range.hpp b/sprout/algorithm/fit/clamp_range.hpp index e144541b..21a37183 100644 --- a/sprout/algorithm/fit/clamp_range.hpp +++ b/sprout/algorithm/fit/clamp_range.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/clamp_range_copy.hpp b/sprout/algorithm/fit/clamp_range_copy.hpp index f41036f5..1361b61c 100644 --- a/sprout/algorithm/fit/clamp_range_copy.hpp +++ b/sprout/algorithm/fit/clamp_range_copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/copy.hpp b/sprout/algorithm/fit/copy.hpp index f1ccacd4..53713fb6 100644 --- a/sprout/algorithm/fit/copy.hpp +++ b/sprout/algorithm/fit/copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/copy_backward.hpp b/sprout/algorithm/fit/copy_backward.hpp index 2493ef0a..ca148a6d 100644 --- a/sprout/algorithm/fit/copy_backward.hpp +++ b/sprout/algorithm/fit/copy_backward.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/copy_if.hpp b/sprout/algorithm/fit/copy_if.hpp index a1842d74..f6c2bc3c 100644 --- a/sprout/algorithm/fit/copy_if.hpp +++ b/sprout/algorithm/fit/copy_if.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/copy_n.hpp b/sprout/algorithm/fit/copy_n.hpp index da25c6c3..bf663e53 100644 --- a/sprout/algorithm/fit/copy_n.hpp +++ b/sprout/algorithm/fit/copy_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/copy_until.hpp b/sprout/algorithm/fit/copy_until.hpp index 9e3b2653..309fbd8f 100644 --- a/sprout/algorithm/fit/copy_until.hpp +++ b/sprout/algorithm/fit/copy_until.hpp @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/copy_while.hpp b/sprout/algorithm/fit/copy_while.hpp index c56fc527..1e9a623f 100644 --- a/sprout/algorithm/fit/copy_while.hpp +++ b/sprout/algorithm/fit/copy_while.hpp @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/fill.hpp b/sprout/algorithm/fit/fill.hpp index 743643a1..4b90427d 100644 --- a/sprout/algorithm/fit/fill.hpp +++ b/sprout/algorithm/fit/fill.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/fill_n.hpp b/sprout/algorithm/fit/fill_n.hpp index 3d6da6d8..110c647e 100644 --- a/sprout/algorithm/fit/fill_n.hpp +++ b/sprout/algorithm/fit/fill_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/generate.hpp b/sprout/algorithm/fit/generate.hpp index 3c56a596..05072ddd 100644 --- a/sprout/algorithm/fit/generate.hpp +++ b/sprout/algorithm/fit/generate.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/generate_n.hpp b/sprout/algorithm/fit/generate_n.hpp index 6ae2215c..77a4b341 100644 --- a/sprout/algorithm/fit/generate_n.hpp +++ b/sprout/algorithm/fit/generate_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/inplace_merge.hpp b/sprout/algorithm/fit/inplace_merge.hpp index add52cdb..4dbee24c 100644 --- a/sprout/algorithm/fit/inplace_merge.hpp +++ b/sprout/algorithm/fit/inplace_merge.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/make_heap.hpp b/sprout/algorithm/fit/make_heap.hpp index 8f377bda..3f24a78d 100644 --- a/sprout/algorithm/fit/make_heap.hpp +++ b/sprout/algorithm/fit/make_heap.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/make_partial_heap.hpp b/sprout/algorithm/fit/make_partial_heap.hpp index d72b853d..8ab123d7 100644 --- a/sprout/algorithm/fit/make_partial_heap.hpp +++ b/sprout/algorithm/fit/make_partial_heap.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/merge.hpp b/sprout/algorithm/fit/merge.hpp index 86087b19..3682ae44 100644 --- a/sprout/algorithm/fit/merge.hpp +++ b/sprout/algorithm/fit/merge.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/next_permutation.hpp b/sprout/algorithm/fit/next_permutation.hpp index f7c74fbe..a93080b3 100644 --- a/sprout/algorithm/fit/next_permutation.hpp +++ b/sprout/algorithm/fit/next_permutation.hpp @@ -6,8 +6,9 @@ #include #include #include -#include -#include +#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/nth_element.hpp b/sprout/algorithm/fit/nth_element.hpp index 94fcef3d..39cb689a 100644 --- a/sprout/algorithm/fit/nth_element.hpp +++ b/sprout/algorithm/fit/nth_element.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/partial_sort.hpp b/sprout/algorithm/fit/partial_sort.hpp index 94a5a622..76dc41ab 100644 --- a/sprout/algorithm/fit/partial_sort.hpp +++ b/sprout/algorithm/fit/partial_sort.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/partition.hpp b/sprout/algorithm/fit/partition.hpp index e5cb7c00..1c484e00 100644 --- a/sprout/algorithm/fit/partition.hpp +++ b/sprout/algorithm/fit/partition.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/partition_copy.hpp b/sprout/algorithm/fit/partition_copy.hpp index c7dd7b51..bccf9733 100644 --- a/sprout/algorithm/fit/partition_copy.hpp +++ b/sprout/algorithm/fit/partition_copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT diff --git a/sprout/algorithm/fit/pop_heap.hpp b/sprout/algorithm/fit/pop_heap.hpp index 11c1a6f8..3f5c6a8b 100644 --- a/sprout/algorithm/fit/pop_heap.hpp +++ b/sprout/algorithm/fit/pop_heap.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/prev_permutation.hpp b/sprout/algorithm/fit/prev_permutation.hpp index 2a6880d8..e2ee7ba0 100644 --- a/sprout/algorithm/fit/prev_permutation.hpp +++ b/sprout/algorithm/fit/prev_permutation.hpp @@ -6,8 +6,9 @@ #include #include #include -#include -#include +#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/push_heap.hpp b/sprout/algorithm/fit/push_heap.hpp index d6892f62..541bbd23 100644 --- a/sprout/algorithm/fit/push_heap.hpp +++ b/sprout/algorithm/fit/push_heap.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/random_swap.hpp b/sprout/algorithm/fit/random_swap.hpp index 4f7670bb..2fa7888b 100644 --- a/sprout/algorithm/fit/random_swap.hpp +++ b/sprout/algorithm/fit/random_swap.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/random_swap_result.hpp b/sprout/algorithm/fit/random_swap_result.hpp index c682bf85..3a8b19a1 100644 --- a/sprout/algorithm/fit/random_swap_result.hpp +++ b/sprout/algorithm/fit/random_swap_result.hpp @@ -2,13 +2,15 @@ #define SPROUT_ALGORITHM_FIT_RANDOM_SWAP_RESULT_HPP #include -#include +#include +#include #include #include #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/recurrence.hpp b/sprout/algorithm/fit/recurrence.hpp index 0a01ad46..e225cc6a 100644 --- a/sprout/algorithm/fit/recurrence.hpp +++ b/sprout/algorithm/fit/recurrence.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/recurrence_n.hpp b/sprout/algorithm/fit/recurrence_n.hpp index 5055584c..bed8cfa2 100644 --- a/sprout/algorithm/fit/recurrence_n.hpp +++ b/sprout/algorithm/fit/recurrence_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/remove.hpp b/sprout/algorithm/fit/remove.hpp index 7cb838ed..778d76a2 100644 --- a/sprout/algorithm/fit/remove.hpp +++ b/sprout/algorithm/fit/remove.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/remove_copy.hpp b/sprout/algorithm/fit/remove_copy.hpp index 9ea33a28..65756db8 100644 --- a/sprout/algorithm/fit/remove_copy.hpp +++ b/sprout/algorithm/fit/remove_copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/remove_copy_if.hpp b/sprout/algorithm/fit/remove_copy_if.hpp index 9ab14332..acb173d3 100644 --- a/sprout/algorithm/fit/remove_copy_if.hpp +++ b/sprout/algorithm/fit/remove_copy_if.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/remove_if.hpp b/sprout/algorithm/fit/remove_if.hpp index a0315f86..c41f1188 100644 --- a/sprout/algorithm/fit/remove_if.hpp +++ b/sprout/algorithm/fit/remove_if.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/replace.hpp b/sprout/algorithm/fit/replace.hpp index 1a44031b..9cd00f8c 100644 --- a/sprout/algorithm/fit/replace.hpp +++ b/sprout/algorithm/fit/replace.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/replace_copy.hpp b/sprout/algorithm/fit/replace_copy.hpp index 654ee7ef..61f1eebf 100644 --- a/sprout/algorithm/fit/replace_copy.hpp +++ b/sprout/algorithm/fit/replace_copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/replace_copy_if.hpp b/sprout/algorithm/fit/replace_copy_if.hpp index 0b466e38..3d09b77f 100644 --- a/sprout/algorithm/fit/replace_copy_if.hpp +++ b/sprout/algorithm/fit/replace_copy_if.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/replace_if.hpp b/sprout/algorithm/fit/replace_if.hpp index 2b830945..51491878 100644 --- a/sprout/algorithm/fit/replace_if.hpp +++ b/sprout/algorithm/fit/replace_if.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/result_of.hpp b/sprout/algorithm/fit/result_of.hpp index 7471d0df..18323204 100644 --- a/sprout/algorithm/fit/result_of.hpp +++ b/sprout/algorithm/fit/result_of.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/reverse.hpp b/sprout/algorithm/fit/reverse.hpp index 9ad44c1f..70a22993 100644 --- a/sprout/algorithm/fit/reverse.hpp +++ b/sprout/algorithm/fit/reverse.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/reverse_copy.hpp b/sprout/algorithm/fit/reverse_copy.hpp index d7129815..7e522d41 100644 --- a/sprout/algorithm/fit/reverse_copy.hpp +++ b/sprout/algorithm/fit/reverse_copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/rotate.hpp b/sprout/algorithm/fit/rotate.hpp index c21e59e4..c8547495 100644 --- a/sprout/algorithm/fit/rotate.hpp +++ b/sprout/algorithm/fit/rotate.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/rotate_copy.hpp b/sprout/algorithm/fit/rotate_copy.hpp index e829c5f4..d6840204 100644 --- a/sprout/algorithm/fit/rotate_copy.hpp +++ b/sprout/algorithm/fit/rotate_copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/set_difference.hpp b/sprout/algorithm/fit/set_difference.hpp index 89dc39ba..4ba9f45b 100644 --- a/sprout/algorithm/fit/set_difference.hpp +++ b/sprout/algorithm/fit/set_difference.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/set_intersection.hpp b/sprout/algorithm/fit/set_intersection.hpp index 8e108f16..f70913ea 100644 --- a/sprout/algorithm/fit/set_intersection.hpp +++ b/sprout/algorithm/fit/set_intersection.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/set_symmetric_difference.hpp b/sprout/algorithm/fit/set_symmetric_difference.hpp index 5d3e6a8e..4c214333 100644 --- a/sprout/algorithm/fit/set_symmetric_difference.hpp +++ b/sprout/algorithm/fit/set_symmetric_difference.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/set_union.hpp b/sprout/algorithm/fit/set_union.hpp index cca1db1d..c2e59537 100644 --- a/sprout/algorithm/fit/set_union.hpp +++ b/sprout/algorithm/fit/set_union.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/shuffle.hpp b/sprout/algorithm/fit/shuffle.hpp index 1dae0457..8480bfae 100644 --- a/sprout/algorithm/fit/shuffle.hpp +++ b/sprout/algorithm/fit/shuffle.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/shuffle_result.hpp b/sprout/algorithm/fit/shuffle_result.hpp index a8a41124..659b3e11 100644 --- a/sprout/algorithm/fit/shuffle_result.hpp +++ b/sprout/algorithm/fit/shuffle_result.hpp @@ -2,13 +2,15 @@ #define SPROUT_ALGORITHM_FIT_SHUFFLE_RESULT_HPP #include -#include +#include +#include #include #include #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/sort.hpp b/sprout/algorithm/fit/sort.hpp index 400f3c6b..c27a69fa 100644 --- a/sprout/algorithm/fit/sort.hpp +++ b/sprout/algorithm/fit/sort.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/sort_heap.hpp b/sprout/algorithm/fit/sort_heap.hpp index 9670f59a..764a2366 100644 --- a/sprout/algorithm/fit/sort_heap.hpp +++ b/sprout/algorithm/fit/sort_heap.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/stable_partition.hpp b/sprout/algorithm/fit/stable_partition.hpp index e52fc06c..7c33091c 100644 --- a/sprout/algorithm/fit/stable_partition.hpp +++ b/sprout/algorithm/fit/stable_partition.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/stable_partition_copy.hpp b/sprout/algorithm/fit/stable_partition_copy.hpp index 645b7e45..c47ebb3a 100644 --- a/sprout/algorithm/fit/stable_partition_copy.hpp +++ b/sprout/algorithm/fit/stable_partition_copy.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/stable_sort.hpp b/sprout/algorithm/fit/stable_sort.hpp index cac42d7e..8612cb17 100644 --- a/sprout/algorithm/fit/stable_sort.hpp +++ b/sprout/algorithm/fit/stable_sort.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/swap_element.hpp b/sprout/algorithm/fit/swap_element.hpp index abba9255..5452404a 100644 --- a/sprout/algorithm/fit/swap_element.hpp +++ b/sprout/algorithm/fit/swap_element.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { diff --git a/sprout/algorithm/fit/swap_element_copy.hpp b/sprout/algorithm/fit/swap_element_copy.hpp index ee8b30b0..ef4d28a4 100644 --- a/sprout/algorithm/fit/swap_element_copy.hpp +++ b/sprout/algorithm/fit/swap_element_copy.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/transform.hpp b/sprout/algorithm/fit/transform.hpp index 6b7ac1f4..69944ad9 100644 --- a/sprout/algorithm/fit/transform.hpp +++ b/sprout/algorithm/fit/transform.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fit/unfold.hpp b/sprout/algorithm/fit/unfold.hpp index f133bfc1..a8b2b8b8 100644 --- a/sprout/algorithm/fit/unfold.hpp +++ b/sprout/algorithm/fit/unfold.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/algorithm/fit/unfold_n.hpp b/sprout/algorithm/fit/unfold_n.hpp index 20daf065..63f4900c 100644 --- a/sprout/algorithm/fit/unfold_n.hpp +++ b/sprout/algorithm/fit/unfold_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fit/unique.hpp b/sprout/algorithm/fit/unique.hpp index bd03f155..e7f4db2a 100644 --- a/sprout/algorithm/fit/unique.hpp +++ b/sprout/algorithm/fit/unique.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fit/unique_copy.hpp b/sprout/algorithm/fit/unique_copy.hpp index f19c415d..0a89453b 100644 --- a/sprout/algorithm/fit/unique_copy.hpp +++ b/sprout/algorithm/fit/unique_copy.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/algorithm/fixed/bogo_sort.hpp b/sprout/algorithm/fixed/bogo_sort.hpp index 3513dfc7..f491f58f 100644 --- a/sprout/algorithm/fixed/bogo_sort.hpp +++ b/sprout/algorithm/fixed/bogo_sort.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/sprout/algorithm/fixed/bogo_sort_result.hpp b/sprout/algorithm/fixed/bogo_sort_result.hpp index 86371a74..0fdebe82 100644 --- a/sprout/algorithm/fixed/bogo_sort_result.hpp +++ b/sprout/algorithm/fixed/bogo_sort_result.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/fixed/bozo_sort.hpp b/sprout/algorithm/fixed/bozo_sort.hpp index 5b4db6f7..a3e70e7e 100644 --- a/sprout/algorithm/fixed/bozo_sort.hpp +++ b/sprout/algorithm/fixed/bozo_sort.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/sprout/algorithm/fixed/bozo_sort_result.hpp b/sprout/algorithm/fixed/bozo_sort_result.hpp index e5bfffd5..125d2184 100644 --- a/sprout/algorithm/fixed/bozo_sort_result.hpp +++ b/sprout/algorithm/fixed/bozo_sort_result.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/fixed/clamp_range_copy.hpp b/sprout/algorithm/fixed/clamp_range_copy.hpp index cdd5e704..de7d237d 100644 --- a/sprout/algorithm/fixed/clamp_range_copy.hpp +++ b/sprout/algorithm/fixed/clamp_range_copy.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT diff --git a/sprout/algorithm/fixed/copy.hpp b/sprout/algorithm/fixed/copy.hpp index 4cee29e7..4fb3f6c3 100644 --- a/sprout/algorithm/fixed/copy.hpp +++ b/sprout/algorithm/fixed/copy.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/algorithm/fixed/copy_backward.hpp b/sprout/algorithm/fixed/copy_backward.hpp index ad96c64f..a21b74d3 100644 --- a/sprout/algorithm/fixed/copy_backward.hpp +++ b/sprout/algorithm/fixed/copy_backward.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/algorithm/fixed/copy_if.hpp b/sprout/algorithm/fixed/copy_if.hpp index 37fea48d..a342ca0a 100644 --- a/sprout/algorithm/fixed/copy_if.hpp +++ b/sprout/algorithm/fixed/copy_if.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/copy_n.hpp b/sprout/algorithm/fixed/copy_n.hpp index d5b203fc..0aa27498 100644 --- a/sprout/algorithm/fixed/copy_n.hpp +++ b/sprout/algorithm/fixed/copy_n.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/fixed/copy_until.hpp b/sprout/algorithm/fixed/copy_until.hpp index 17dcd61c..7a1cab17 100644 --- a/sprout/algorithm/fixed/copy_until.hpp +++ b/sprout/algorithm/fixed/copy_until.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/copy_while.hpp b/sprout/algorithm/fixed/copy_while.hpp index 4c641900..12f4e13c 100644 --- a/sprout/algorithm/fixed/copy_while.hpp +++ b/sprout/algorithm/fixed/copy_while.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/fill.hpp b/sprout/algorithm/fixed/fill.hpp index dfa03cef..6b809c99 100644 --- a/sprout/algorithm/fixed/fill.hpp +++ b/sprout/algorithm/fixed/fill.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace sprout { namespace fixed { diff --git a/sprout/algorithm/fixed/fill_n.hpp b/sprout/algorithm/fixed/fill_n.hpp index c354511c..392048d9 100644 --- a/sprout/algorithm/fixed/fill_n.hpp +++ b/sprout/algorithm/fixed/fill_n.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace sprout { namespace fixed { diff --git a/sprout/algorithm/fixed/generate.hpp b/sprout/algorithm/fixed/generate.hpp index 5575118c..69998b4f 100644 --- a/sprout/algorithm/fixed/generate.hpp +++ b/sprout/algorithm/fixed/generate.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/generate_n.hpp b/sprout/algorithm/fixed/generate_n.hpp index 8cc1d27c..2c936990 100644 --- a/sprout/algorithm/fixed/generate_n.hpp +++ b/sprout/algorithm/fixed/generate_n.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace sprout { namespace fixed { diff --git a/sprout/algorithm/fixed/merge.hpp b/sprout/algorithm/fixed/merge.hpp index 5e4c644e..290efde1 100644 --- a/sprout/algorithm/fixed/merge.hpp +++ b/sprout/algorithm/fixed/merge.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/next_permutation.hpp b/sprout/algorithm/fixed/next_permutation.hpp index 63465f2a..e22f84a7 100644 --- a/sprout/algorithm/fixed/next_permutation.hpp +++ b/sprout/algorithm/fixed/next_permutation.hpp @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fixed/partition_copy.hpp b/sprout/algorithm/fixed/partition_copy.hpp index e86ef1a5..1709b499 100644 --- a/sprout/algorithm/fixed/partition_copy.hpp +++ b/sprout/algorithm/fixed/partition_copy.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/prev_permutation.hpp b/sprout/algorithm/fixed/prev_permutation.hpp index 3adab779..d1137a54 100644 --- a/sprout/algorithm/fixed/prev_permutation.hpp +++ b/sprout/algorithm/fixed/prev_permutation.hpp @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/fixed/random_swap.hpp b/sprout/algorithm/fixed/random_swap.hpp index 3f4ae483..ce59181a 100644 --- a/sprout/algorithm/fixed/random_swap.hpp +++ b/sprout/algorithm/fixed/random_swap.hpp @@ -3,12 +3,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/fixed/random_swap_result.hpp b/sprout/algorithm/fixed/random_swap_result.hpp index f557fc94..59a523bc 100644 --- a/sprout/algorithm/fixed/random_swap_result.hpp +++ b/sprout/algorithm/fixed/random_swap_result.hpp @@ -4,13 +4,14 @@ #include #include #include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/fixed/recurrence.hpp b/sprout/algorithm/fixed/recurrence.hpp index 66cd4040..50a37e09 100644 --- a/sprout/algorithm/fixed/recurrence.hpp +++ b/sprout/algorithm/fixed/recurrence.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/recurrence_n.hpp b/sprout/algorithm/fixed/recurrence_n.hpp index a41297b2..74d5c1be 100644 --- a/sprout/algorithm/fixed/recurrence_n.hpp +++ b/sprout/algorithm/fixed/recurrence_n.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace sprout { namespace fixed { diff --git a/sprout/algorithm/fixed/remove_copy.hpp b/sprout/algorithm/fixed/remove_copy.hpp index 3c03941b..00c53ab5 100644 --- a/sprout/algorithm/fixed/remove_copy.hpp +++ b/sprout/algorithm/fixed/remove_copy.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/remove_copy_if.hpp b/sprout/algorithm/fixed/remove_copy_if.hpp index e1be2a5d..bfffd042 100644 --- a/sprout/algorithm/fixed/remove_copy_if.hpp +++ b/sprout/algorithm/fixed/remove_copy_if.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/replace_copy.hpp b/sprout/algorithm/fixed/replace_copy.hpp index a765d887..c7ad9058 100644 --- a/sprout/algorithm/fixed/replace_copy.hpp +++ b/sprout/algorithm/fixed/replace_copy.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT diff --git a/sprout/algorithm/fixed/replace_copy_if.hpp b/sprout/algorithm/fixed/replace_copy_if.hpp index b3afce1e..1227a1b1 100644 --- a/sprout/algorithm/fixed/replace_copy_if.hpp +++ b/sprout/algorithm/fixed/replace_copy_if.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/result_of.hpp b/sprout/algorithm/fixed/result_of.hpp index 4f99b50e..99d56bcb 100644 --- a/sprout/algorithm/fixed/result_of.hpp +++ b/sprout/algorithm/fixed/result_of.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace sprout { namespace fixed { diff --git a/sprout/algorithm/fixed/reverse_copy.hpp b/sprout/algorithm/fixed/reverse_copy.hpp index fd93f55a..26f128a5 100644 --- a/sprout/algorithm/fixed/reverse_copy.hpp +++ b/sprout/algorithm/fixed/reverse_copy.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/rotate_copy.hpp b/sprout/algorithm/fixed/rotate_copy.hpp index 05862ec5..2e6fd008 100644 --- a/sprout/algorithm/fixed/rotate_copy.hpp +++ b/sprout/algorithm/fixed/rotate_copy.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/set_difference.hpp b/sprout/algorithm/fixed/set_difference.hpp index 7f5fd499..d9565f04 100644 --- a/sprout/algorithm/fixed/set_difference.hpp +++ b/sprout/algorithm/fixed/set_difference.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/set_intersection.hpp b/sprout/algorithm/fixed/set_intersection.hpp index c2f19501..cc465fb7 100644 --- a/sprout/algorithm/fixed/set_intersection.hpp +++ b/sprout/algorithm/fixed/set_intersection.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/set_symmetric_difference.hpp b/sprout/algorithm/fixed/set_symmetric_difference.hpp index 1bd95977..ca4bbb19 100644 --- a/sprout/algorithm/fixed/set_symmetric_difference.hpp +++ b/sprout/algorithm/fixed/set_symmetric_difference.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/set_union.hpp b/sprout/algorithm/fixed/set_union.hpp index 23cbd695..2be4f0fc 100644 --- a/sprout/algorithm/fixed/set_union.hpp +++ b/sprout/algorithm/fixed/set_union.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/shuffle.hpp b/sprout/algorithm/fixed/shuffle.hpp index 10f10598..e4a78ce9 100644 --- a/sprout/algorithm/fixed/shuffle.hpp +++ b/sprout/algorithm/fixed/shuffle.hpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sprout/algorithm/fixed/shuffle_result.hpp b/sprout/algorithm/fixed/shuffle_result.hpp index 87b252f7..a7dd433a 100644 --- a/sprout/algorithm/fixed/shuffle_result.hpp +++ b/sprout/algorithm/fixed/shuffle_result.hpp @@ -5,13 +5,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/fixed/stable_partition_copy.hpp b/sprout/algorithm/fixed/stable_partition_copy.hpp index 9fb218ec..9dc9821d 100644 --- a/sprout/algorithm/fixed/stable_partition_copy.hpp +++ b/sprout/algorithm/fixed/stable_partition_copy.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/swap_element_copy.hpp b/sprout/algorithm/fixed/swap_element_copy.hpp index c04b9ad1..c1d1186e 100644 --- a/sprout/algorithm/fixed/swap_element_copy.hpp +++ b/sprout/algorithm/fixed/swap_element_copy.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/transform.hpp b/sprout/algorithm/fixed/transform.hpp index 464054aa..d9c88c3d 100644 --- a/sprout/algorithm/fixed/transform.hpp +++ b/sprout/algorithm/fixed/transform.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/unfold.hpp b/sprout/algorithm/fixed/unfold.hpp index 6b24edb4..5aab9f95 100644 --- a/sprout/algorithm/fixed/unfold.hpp +++ b/sprout/algorithm/fixed/unfold.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/fixed/unfold_n.hpp b/sprout/algorithm/fixed/unfold_n.hpp index e78fb199..ae06aaad 100644 --- a/sprout/algorithm/fixed/unfold_n.hpp +++ b/sprout/algorithm/fixed/unfold_n.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace sprout { namespace fixed { diff --git a/sprout/algorithm/fixed/unique_copy.hpp b/sprout/algorithm/fixed/unique_copy.hpp index 4967ee1e..fe6e0f41 100644 --- a/sprout/algorithm/fixed/unique_copy.hpp +++ b/sprout/algorithm/fixed/unique_copy.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/algorithm/includes.hpp b/sprout/algorithm/includes.hpp index d19a74a1..d3564bce 100644 --- a/sprout/algorithm/includes.hpp +++ b/sprout/algorithm/includes.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/is_partitioned.hpp b/sprout/algorithm/is_partitioned.hpp index 057e1046..727f79b6 100644 --- a/sprout/algorithm/is_partitioned.hpp +++ b/sprout/algorithm/is_partitioned.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/algorithm/is_permutation.hpp b/sprout/algorithm/is_permutation.hpp index 61b940bd..f91d8557 100644 --- a/sprout/algorithm/is_permutation.hpp +++ b/sprout/algorithm/is_permutation.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/is_sorted_until.hpp b/sprout/algorithm/is_sorted_until.hpp index 283f85ca..537ce75b 100644 --- a/sprout/algorithm/is_sorted_until.hpp +++ b/sprout/algorithm/is_sorted_until.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/lexicographical_compare.hpp b/sprout/algorithm/lexicographical_compare.hpp index bb836bd4..bbd7d081 100644 --- a/sprout/algorithm/lexicographical_compare.hpp +++ b/sprout/algorithm/lexicographical_compare.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/algorithm/max_element.hpp b/sprout/algorithm/max_element.hpp index 9dc1ac55..aa1a2a56 100644 --- a/sprout/algorithm/max_element.hpp +++ b/sprout/algorithm/max_element.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/min_element.hpp b/sprout/algorithm/min_element.hpp index b58417f1..89ba91e1 100644 --- a/sprout/algorithm/min_element.hpp +++ b/sprout/algorithm/min_element.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/minmax.hpp b/sprout/algorithm/minmax.hpp index 826b8e22..cd2b5005 100644 --- a/sprout/algorithm/minmax.hpp +++ b/sprout/algorithm/minmax.hpp @@ -2,7 +2,7 @@ #define SPROUT_ALGORITHM_MINMAX_HPP #include -#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/minmax_element.hpp b/sprout/algorithm/minmax_element.hpp index 72fe0873..39a92df2 100644 --- a/sprout/algorithm/minmax_element.hpp +++ b/sprout/algorithm/minmax_element.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/algorithm/mismatch.hpp b/sprout/algorithm/mismatch.hpp index c69a871f..99179331 100644 --- a/sprout/algorithm/mismatch.hpp +++ b/sprout/algorithm/mismatch.hpp @@ -6,9 +6,10 @@ #include #include #include -#include +#include +#include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/next_difference.hpp b/sprout/algorithm/next_difference.hpp index 266ca461..ddad6e6e 100644 --- a/sprout/algorithm/next_difference.hpp +++ b/sprout/algorithm/next_difference.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/next_intersection.hpp b/sprout/algorithm/next_intersection.hpp index 4dd37054..8c69a9b2 100644 --- a/sprout/algorithm/next_intersection.hpp +++ b/sprout/algorithm/next_intersection.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/next_symmetric_difference.hpp b/sprout/algorithm/next_symmetric_difference.hpp index 1e7e0473..1b033c2a 100644 --- a/sprout/algorithm/next_symmetric_difference.hpp +++ b/sprout/algorithm/next_symmetric_difference.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/next_union.hpp b/sprout/algorithm/next_union.hpp index cffbfc0e..16fe3001 100644 --- a/sprout/algorithm/next_union.hpp +++ b/sprout/algorithm/next_union.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace sprout { // diff --git a/sprout/algorithm/none_of.hpp b/sprout/algorithm/none_of.hpp index ed2b4bd4..2548da8e 100644 --- a/sprout/algorithm/none_of.hpp +++ b/sprout/algorithm/none_of.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/none_of_equal.hpp b/sprout/algorithm/none_of_equal.hpp index 07203205..e8a851c2 100644 --- a/sprout/algorithm/none_of_equal.hpp +++ b/sprout/algorithm/none_of_equal.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/one_of.hpp b/sprout/algorithm/one_of.hpp index c0412d3e..016d972c 100644 --- a/sprout/algorithm/one_of.hpp +++ b/sprout/algorithm/one_of.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/one_of_equal.hpp b/sprout/algorithm/one_of_equal.hpp index f47d4b88..0309b9af 100644 --- a/sprout/algorithm/one_of_equal.hpp +++ b/sprout/algorithm/one_of_equal.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace sprout { namespace detail { diff --git a/sprout/algorithm/search.hpp b/sprout/algorithm/search.hpp index 093e21f4..8fa3f1dd 100644 --- a/sprout/algorithm/search.hpp +++ b/sprout/algorithm/search.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/algorithm/set_intersection_iterator.hpp b/sprout/algorithm/set_intersection_iterator.hpp index a096386e..53c57cc2 100644 --- a/sprout/algorithm/set_intersection_iterator.hpp +++ b/sprout/algorithm/set_intersection_iterator.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/algorithm/string/join.hpp b/sprout/algorithm/string/join.hpp index f10657c4..9e12feb7 100644 --- a/sprout/algorithm/string/join.hpp +++ b/sprout/algorithm/string/join.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/algorithm/tristate_lexicographical_compare.hpp b/sprout/algorithm/tristate_lexicographical_compare.hpp index 0956e117..af41d638 100644 --- a/sprout/algorithm/tristate_lexicographical_compare.hpp +++ b/sprout/algorithm/tristate_lexicographical_compare.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/brainfuck/brainfuck.hpp b/sprout/brainfuck/brainfuck.hpp index 70ff6c52..48b9c1d9 100644 --- a/sprout/brainfuck/brainfuck.hpp +++ b/sprout/brainfuck/brainfuck.hpp @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sprout/brainfuck/misa.hpp b/sprout/brainfuck/misa.hpp index 06a09ad0..0e3d69c6 100644 --- a/sprout/brainfuck/misa.hpp +++ b/sprout/brainfuck/misa.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/sprout/brainfuck/ook.hpp b/sprout/brainfuck/ook.hpp index e4a23cbf..0a1cbe92 100644 --- a/sprout/brainfuck/ook.hpp +++ b/sprout/brainfuck/ook.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/sprout/checksum/md5.hpp b/sprout/checksum/md5.hpp index 142a4fb0..efa178ce 100644 --- a/sprout/checksum/md5.hpp +++ b/sprout/checksum/md5.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/checksum/sha1.hpp b/sprout/checksum/sha1.hpp index e2f05ba7..d20c95af 100644 --- a/sprout/checksum/sha1.hpp +++ b/sprout/checksum/sha1.hpp @@ -6,8 +6,10 @@ #include #include #include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sprout/compost/effects/superposed.hpp b/sprout/compost/effects/superposed.hpp index 3ce63c8d..26767381 100644 --- a/sprout/compost/effects/superposed.hpp +++ b/sprout/compost/effects/superposed.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/compost/sources/source.hpp b/sprout/compost/sources/source.hpp index 3211d504..2f856e28 100644 --- a/sprout/compost/sources/source.hpp +++ b/sprout/compost/sources/source.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include // // COMPOST_LOAD_SOURCE diff --git a/sprout/compost/utility/iir_filter.hpp b/sprout/compost/utility/iir_filter.hpp index a5724cb3..4a352c8b 100644 --- a/sprout/compost/utility/iir_filter.hpp +++ b/sprout/compost/utility/iir_filter.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/compost/waves/white_noise.hpp b/sprout/compost/waves/white_noise.hpp index 24923422..72371cea 100644 --- a/sprout/compost/waves/white_noise.hpp +++ b/sprout/compost/waves/white_noise.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/sprout/cstring/strchr.hpp b/sprout/cstring/strchr.hpp index c25f4803..72628ce6 100644 --- a/sprout/cstring/strchr.hpp +++ b/sprout/cstring/strchr.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/cstring/strcmp.hpp b/sprout/cstring/strcmp.hpp index 48cc9703..c58ec23b 100644 --- a/sprout/cstring/strcmp.hpp +++ b/sprout/cstring/strcmp.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/cstring/strlen.hpp b/sprout/cstring/strlen.hpp index 5923d8b4..add8841e 100644 --- a/sprout/cstring/strlen.hpp +++ b/sprout/cstring/strlen.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/cstring/strpbrk.hpp b/sprout/cstring/strpbrk.hpp index dc86263e..3cbc62ae 100644 --- a/sprout/cstring/strpbrk.hpp +++ b/sprout/cstring/strpbrk.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/cstring/strrchr.hpp b/sprout/cstring/strrchr.hpp index 1d67fb38..8a3e4840 100644 --- a/sprout/cstring/strrchr.hpp +++ b/sprout/cstring/strrchr.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/cstring/strstr.hpp b/sprout/cstring/strstr.hpp index 95225fbf..3a869726 100644 --- a/sprout/cstring/strstr.hpp +++ b/sprout/cstring/strstr.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/darkroom/materials/texture_map.hpp b/sprout/darkroom/materials/texture_map.hpp index aa7059c1..036aaa76 100644 --- a/sprout/darkroom/materials/texture_map.hpp +++ b/sprout/darkroom/materials/texture_map.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/darkroom/objects/polygon/triangle.hpp b/sprout/darkroom/objects/polygon/triangle.hpp index b0990a76..dc6a32ca 100644 --- a/sprout/darkroom/objects/polygon/triangle.hpp +++ b/sprout/darkroom/objects/polygon/triangle.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/sprout/darkroom/pixels/generate.hpp b/sprout/darkroom/pixels/generate.hpp index 20669a4c..a191770b 100644 --- a/sprout/darkroom/pixels/generate.hpp +++ b/sprout/darkroom/pixels/generate.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/darkroom/textures/texture.hpp b/sprout/darkroom/textures/texture.hpp index 607c3d07..240d094c 100644 --- a/sprout/darkroom/textures/texture.hpp +++ b/sprout/darkroom/textures/texture.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/sprout/detail/algorithm/count_n.hpp b/sprout/detail/algorithm/count_n.hpp index 1fd95574..b032c2d5 100644 --- a/sprout/detail/algorithm/count_n.hpp +++ b/sprout/detail/algorithm/count_n.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/detail/algorithm/count_n_if.hpp b/sprout/detail/algorithm/count_n_if.hpp index 82e302c4..791477e7 100644 --- a/sprout/detail/algorithm/count_n_if.hpp +++ b/sprout/detail/algorithm/count_n_if.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/detail/algorithm/overlap_count.hpp b/sprout/detail/algorithm/overlap_count.hpp index dcc50eae..ca149a89 100644 --- a/sprout/detail/algorithm/overlap_count.hpp +++ b/sprout/detail/algorithm/overlap_count.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/detail/algorithm/search_one.hpp b/sprout/detail/algorithm/search_one.hpp index 45f6d0b0..16ef1ca1 100644 --- a/sprout/detail/algorithm/search_one.hpp +++ b/sprout/detail/algorithm/search_one.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace detail { diff --git a/sprout/detail/algorithm/set_overlap_count.hpp b/sprout/detail/algorithm/set_overlap_count.hpp index 1bdfa3e8..d55ebf93 100644 --- a/sprout/detail/algorithm/set_overlap_count.hpp +++ b/sprout/detail/algorithm/set_overlap_count.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include #include namespace sprout { diff --git a/sprout/functional/hash/detail/hash_float.hpp b/sprout/functional/hash/detail/hash_float.hpp new file mode 100644 index 00000000..1ea49585 --- /dev/null +++ b/sprout/functional/hash/detail/hash_float.hpp @@ -0,0 +1,78 @@ +#ifndef SPROUT_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_HPP +#define SPROUT_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_HPP + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace sprout { + namespace detail { + inline SPROUT_CONSTEXPR std::size_t + hash_float_combine(std::size_t seed, std::size_t value) { + return seed ^ (value + (seed << 6) + (seed >> 2)); + } + + template + inline SPROUT_CONSTEXPR std::size_t + float_hash_value_impl_4(T v, int exp, std::size_t seed, std::size_t length, std::size_t i = 0) { + return i != length ? sprout::detail::float_hash_value_impl_4( + sprout::math::scalbn(v - static_cast(static_cast(v)), std::numeric_limits::digits), + exp, sprout::detail::hash_float_combine(seed, static_cast(v)), + length, i + 1 + ) + : sprout::detail::hash_float_combine(seed, exp) + ; + } + template + inline SPROUT_CONSTEXPR std::size_t + float_hash_value_impl_3(T v, int exp) { + return sprout::detail::float_hash_value_impl_4( + sprout::math::scalbn(v - static_cast(static_cast(v)), std::numeric_limits::digits), + exp, static_cast(v), + (std::numeric_limits::digits * sprout::detail::static_log2::radix>::value + std::numeric_limits::digits - 1) + / std::numeric_limits::digits + ); + } + template + inline SPROUT_CONSTEXPR std::size_t + float_hash_value_impl_2(T v, int exp) { + return sprout::detail::float_hash_value_impl_3(sprout::math::scalbn(v, std::numeric_limits::digits), exp); + } + template + inline SPROUT_CONSTEXPR std::size_t + float_hash_value_impl_1(P const& p) { + return ((p.first) < 0) ? sprout::detail::float_hash_value_impl_2( + -p.first, p.second + (std::numeric_limits::max_exponent - std::numeric_limits::min_exponent) + ) + : sprout::detail::float_hash_value_impl_2(p.first, p.second) + ; + } + template + inline SPROUT_CONSTEXPR std::size_t + float_hash_value_impl(T v) { + return sprout::detail::float_hash_value_impl_1(sprout::math::float_pair(v)); + } + + template + inline SPROUT_CONSTEXPR std::size_t + float_hash_value_1(T v, int fp) { + return fp == FP_ZERO ? 0 + : fp == FP_INFINITE ? std::size_t(v > 0 ? -1 : -2) + : fp == FP_NAN ? std::size_t(-3) + : sprout::detail::float_hash_value_impl(v) + ; + } + template + inline SPROUT_CONSTEXPR std::size_t + float_hash_value(T v) { + return sprout::detail::float_hash_value_1(v, sprout::math::fpclassify(v)); + } + } // namespace detail +} // namespace sprout + +#endif // #ifndef SPROUT_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_HPP diff --git a/sprout/functional/hash/hash_value.hpp b/sprout/functional/hash/hash_value.hpp index 1d421066..dbd0bb3a 100644 --- a/sprout/functional/hash/hash_value.hpp +++ b/sprout/functional/hash/hash_value.hpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace sprout { namespace hash_detail { @@ -129,6 +130,11 @@ namespace sprout { return sprout::hash_value(static_cast::type>(v)); } template + inline SPROUT_CONSTEXPR typename std::enable_if::value, std::size_t>::type + hash_value(T v) { + return sprout::detail::float_hash_value(v); + } + template inline SPROUT_CONSTEXPR typename std::enable_if::type>::value, std::size_t>::type hash_value(T&& v) { return sprout::hash_detail::hash_value_pointer(v); diff --git a/sprout/io.hpp b/sprout/io.hpp index 3018ef99..a3cc5bc2 100644 --- a/sprout/io.hpp +++ b/sprout/io.hpp @@ -7,10 +7,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/sprout/iterator/index_iterator.hpp b/sprout/iterator/index_iterator.hpp index e356f62b..2fe91cdd 100644 --- a/sprout/iterator/index_iterator.hpp +++ b/sprout/iterator/index_iterator.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/iterator/set_difference_iterator.hpp b/sprout/iterator/set_difference_iterator.hpp index a40eac5f..1cf80376 100644 --- a/sprout/iterator/set_difference_iterator.hpp +++ b/sprout/iterator/set_difference_iterator.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/iterator/set_intersection_iterator.hpp b/sprout/iterator/set_intersection_iterator.hpp index 257aa291..fcf98cd7 100644 --- a/sprout/iterator/set_intersection_iterator.hpp +++ b/sprout/iterator/set_intersection_iterator.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/iterator/set_symmetric_difference_iterator.hpp b/sprout/iterator/set_symmetric_difference_iterator.hpp index a76b5fbf..f5ff1f11 100644 --- a/sprout/iterator/set_symmetric_difference_iterator.hpp +++ b/sprout/iterator/set_symmetric_difference_iterator.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/iterator/set_union_iterator.hpp b/sprout/iterator/set_union_iterator.hpp index d4f6e1ce..08245e36 100644 --- a/sprout/iterator/set_union_iterator.hpp +++ b/sprout/iterator/set_union_iterator.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/iterator/value_iterator.hpp b/sprout/iterator/value_iterator.hpp index de626a2e..04eb0ed2 100644 --- a/sprout/iterator/value_iterator.hpp +++ b/sprout/iterator/value_iterator.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/iterator/valued_iterator.hpp b/sprout/iterator/valued_iterator.hpp index 91aeb0e2..251f511e 100644 --- a/sprout/iterator/valued_iterator.hpp +++ b/sprout/iterator/valued_iterator.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace sprout { // diff --git a/sprout/math/bernoulli.hpp b/sprout/math/bernoulli.hpp index a37e5504..53d40560 100644 --- a/sprout/math/bernoulli.hpp +++ b/sprout/math/bernoulli.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace sprout { namespace math { diff --git a/sprout/math/factorial.hpp b/sprout/math/factorial.hpp index 1d38f4f6..f7f6857e 100644 --- a/sprout/math/factorial.hpp +++ b/sprout/math/factorial.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/math/float_mantissa.hpp b/sprout/math/float_mantissa.hpp index d4f692ff..0d66f7be 100644 --- a/sprout/math/float_mantissa.hpp +++ b/sprout/math/float_mantissa.hpp @@ -1,7 +1,7 @@ #ifndef SPROUT_MATH_FLOAT_MANTISSA_HPP #define SPROUT_MATH_FLOAT_MANTISSA_HPP -#include +#include #include #include #include @@ -18,7 +18,7 @@ namespace sprout { > inline SPROUT_CONSTEXPR FloatType float_mantissa(FloatType x) { - return x / sprout::detail::pow_n(FloatType(FLT_RADIX), sprout::math::float_exponent(x)); + return x / sprout::detail::pow_n(FloatType(std::numeric_limits::radix), sprout::math::float_exponent(x)); } template< diff --git a/sprout/math/float_pair.hpp b/sprout/math/float_pair.hpp index cb57cb1e..386e57b8 100644 --- a/sprout/math/float_pair.hpp +++ b/sprout/math/float_pair.hpp @@ -1,14 +1,14 @@ #ifndef SPROUT_MATH_FLOAT_PAIR_HPP #define SPROUT_MATH_FLOAT_PAIR_HPP -#include +#include #include #include #include #include #include #include -#include +#include namespace sprout { namespace math { @@ -16,7 +16,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR sprout::pair float_pair_impl(T x, int exp) { - return sprout::pair(x / sprout::detail::pow_n(T(FLT_RADIX), exp), exp); + return sprout::pair(x / sprout::detail::pow_n(T(std::numeric_limits::radix), exp), exp); } template< diff --git a/sprout/math/gcd.hpp b/sprout/math/gcd.hpp index e94fdb63..515e10ea 100644 --- a/sprout/math/gcd.hpp +++ b/sprout/math/gcd.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #ifdef SPROUT_WORKAROUND_NOT_TERMINATE_RECURSIVE_CONSTEXPR_FUNCTION_TEMPLATE # include diff --git a/sprout/math/logb.hpp b/sprout/math/logb.hpp index c8541728..f6404431 100644 --- a/sprout/math/logb.hpp +++ b/sprout/math/logb.hpp @@ -1,15 +1,15 @@ #ifndef SPROUT_MATH_LOGB_HPP #define SPROUT_MATH_LOGB_HPP -#include -#include #include +#include #include #include #include #include #include #include +#include #include namespace sprout { @@ -18,28 +18,36 @@ namespace sprout { template inline SPROUT_CONSTEXPR T logb_impl_2_neg_lo(T x, T x0, T base, T exp) { - return base < 1 ? sprout::math::detail::logb_impl_2_neg_lo(x, x0 * FLT_RADIX, x / (x0 / FLT_RADIX), exp - 1) + return base < 1 ? sprout::math::detail::logb_impl_2_neg_lo( + x, x0 * std::numeric_limits::radix, x / (x0 / std::numeric_limits::radix), exp - 1 + ) : exp ; } template inline SPROUT_CONSTEXPR T logb_impl_2_neg_hi(T x, T x0, T base, T exp) { - return !(base < FLT_RADIX) ? sprout::math::detail::logb_impl_2_neg_hi(x, x0 / FLT_RADIX, x / (x0 * FLT_RADIX), exp + 1) + return !(base < std::numeric_limits::radix) ? sprout::math::detail::logb_impl_2_neg_hi( + x, x0 / std::numeric_limits::radix, x / (x0 * std::numeric_limits::radix), exp + 1 + ) : exp ; } template inline SPROUT_CONSTEXPR T logb_impl_2_pos_lo(T x, T x0, T base, T exp) { - return base < 1 ? sprout::math::detail::logb_impl_2_pos_lo(x, x0 * FLT_RADIX, x / (x0 / FLT_RADIX), exp + 1) + return base < 1 ? sprout::math::detail::logb_impl_2_pos_lo( + x, x0 * std::numeric_limits::radix, x / (x0 / std::numeric_limits::radix), exp + 1 + ) : exp ; } template inline SPROUT_CONSTEXPR T logb_impl_2_pos_hi(T x, T x0, T base, T exp) { - return !(base < FLT_RADIX) ? sprout::math::detail::logb_impl_2_pos_hi(x, x0 / FLT_RADIX, x / (x0 * FLT_RADIX), exp - 1) + return !(base < std::numeric_limits::radix) ? sprout::math::detail::logb_impl_2_pos_hi( + x, x0 / std::numeric_limits::radix, x / (x0 * std::numeric_limits::radix), exp - 1 + ) : exp ; } @@ -47,11 +55,19 @@ namespace sprout { inline SPROUT_CONSTEXPR T logb_impl_2(T x, T x0, T base, T exp) { return exp < 0 - ? base < 1 ? sprout::math::detail::logb_impl_2_neg_lo(x, x0 * FLT_RADIX, x / (x0 / FLT_RADIX), exp - 1) - : !(base < FLT_RADIX) ? sprout::math::detail::logb_impl_2_neg_hi(x, x0 / FLT_RADIX, x / (x0 * FLT_RADIX), exp + 1) + ? base < 1 ? sprout::math::detail::logb_impl_2_neg_lo( + x, x0 * std::numeric_limits::radix, x / (x0 / std::numeric_limits::radix), exp - 1 + ) + : !(base < std::numeric_limits::radix) ? sprout::math::detail::logb_impl_2_neg_hi( + x, x0 / std::numeric_limits::radix, x / (x0 * std::numeric_limits::radix), exp + 1 + ) : exp - : base < 1 ? sprout::math::detail::logb_impl_2_pos_lo(x, x0 * FLT_RADIX, x / (x0 / FLT_RADIX), exp + 1) - : !(base < FLT_RADIX) ? sprout::math::detail::logb_impl_2_pos_hi(x, x0 / FLT_RADIX, x / (x0 * FLT_RADIX), exp - 1) + : base < 1 ? sprout::math::detail::logb_impl_2_pos_lo( + x, x0 * std::numeric_limits::radix, x / (x0 / std::numeric_limits::radix), exp + 1 + ) + : !(base < std::numeric_limits::radix) ? sprout::math::detail::logb_impl_2_pos_hi( + x, x0 / std::numeric_limits::radix, x / (x0 * std::numeric_limits::radix), exp - 1 + ) : exp ; } @@ -66,7 +82,7 @@ namespace sprout { return std::numeric_limits::max() < exp || std::numeric_limits::min() > exp ? SPROUT_MATH_THROW_LARGE_FLOAT_ROUNDING(std::domain_error("trunc: large float rounding."), exp) : sprout::math::detail::logb_impl_1( - x, sprout::detail::pow_n(T(FLT_RADIX), static_cast(exp)), + x, sprout::detail::pow_n(T(std::numeric_limits::radix), static_cast(exp)), static_cast(static_cast(exp)) ) ; @@ -78,8 +94,12 @@ namespace sprout { > inline SPROUT_CONSTEXPR FloatType logb(FloatType x) { - return x < 0 ? sprout::math::detail::logb_impl(-x, sprout::math::trunc(sprout::math::log_a(FloatType(FLT_RADIX), -x))) - : sprout::math::detail::logb_impl(x, sprout::math::trunc(sprout::math::log_a(FloatType(FLT_RADIX), x))) + return x < 0 ? sprout::math::detail::logb_impl( + -x, sprout::math::trunc(sprout::math::log_a(FloatType(std::numeric_limits::radix), -x)) + ) + : sprout::math::detail::logb_impl( + x, sprout::math::trunc(sprout::math::log_a(FloatType(std::numeric_limits::radix), x)) + ) ; } diff --git a/sprout/math/scalbln.hpp b/sprout/math/scalbln.hpp index 0d5f9acb..3a86f06f 100644 --- a/sprout/math/scalbln.hpp +++ b/sprout/math/scalbln.hpp @@ -1,7 +1,7 @@ #ifndef SPROUT_MATH_SCALBLN_HPP #define SPROUT_MATH_SCALBLN_HPP -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace sprout { > inline SPROUT_CONSTEXPR FloatType scalbln(FloatType x, long exp) { - return x * sprout::detail::pow_n(FloatType(FLT_RADIX), exp); + return x * sprout::detail::pow_n(FloatType(std::numeric_limits::radix), exp); } template< diff --git a/sprout/math/scalbn.hpp b/sprout/math/scalbn.hpp index f2d0533e..4290e99f 100644 --- a/sprout/math/scalbn.hpp +++ b/sprout/math/scalbn.hpp @@ -1,7 +1,7 @@ #ifndef SPROUT_MATH_SCALBN_HPP #define SPROUT_MATH_SCALBN_HPP -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace sprout { > inline SPROUT_CONSTEXPR FloatType scalbn(FloatType x, int exp) { - return x * sprout::detail::pow_n(FloatType(FLT_RADIX), exp); + return x * sprout::detail::pow_n(FloatType(std::numeric_limits::radix), exp); } template< diff --git a/sprout/numeric/dft/fit/amplitude_spectrum.hpp b/sprout/numeric/dft/fit/amplitude_spectrum.hpp index 494cb63e..c88c576d 100644 --- a/sprout/numeric/dft/fit/amplitude_spectrum.hpp +++ b/sprout/numeric/dft/fit/amplitude_spectrum.hpp @@ -7,8 +7,9 @@ #include #include #include -#include -#include +#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/numeric/dft/fit/dft.hpp b/sprout/numeric/dft/fit/dft.hpp index 318d43a7..2aaa1267 100644 --- a/sprout/numeric/dft/fit/dft.hpp +++ b/sprout/numeric/dft/fit/dft.hpp @@ -7,8 +7,9 @@ #include #include #include -#include -#include +#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/numeric/dft/fit/idft.hpp b/sprout/numeric/dft/fit/idft.hpp index 8ad9a61c..6534635d 100644 --- a/sprout/numeric/dft/fit/idft.hpp +++ b/sprout/numeric/dft/fit/idft.hpp @@ -7,8 +7,9 @@ #include #include #include -#include -#include +#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/numeric/dft/fit/phase_spectrum.hpp b/sprout/numeric/dft/fit/phase_spectrum.hpp index e883fc55..cc6650f9 100644 --- a/sprout/numeric/dft/fit/phase_spectrum.hpp +++ b/sprout/numeric/dft/fit/phase_spectrum.hpp @@ -7,8 +7,9 @@ #include #include #include -#include -#include +#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/numeric/dft/fit/sawtooth.hpp b/sprout/numeric/dft/fit/sawtooth.hpp index c22bb99d..f019ef52 100644 --- a/sprout/numeric/dft/fit/sawtooth.hpp +++ b/sprout/numeric/dft/fit/sawtooth.hpp @@ -6,8 +6,9 @@ #include #include #include -#include -#include +#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/numeric/dft/fit/sinusoid.hpp b/sprout/numeric/dft/fit/sinusoid.hpp index 19c5eb26..996908d7 100644 --- a/sprout/numeric/dft/fit/sinusoid.hpp +++ b/sprout/numeric/dft/fit/sinusoid.hpp @@ -6,8 +6,9 @@ #include #include #include -#include -#include +#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/numeric/dft/fit/square.hpp b/sprout/numeric/dft/fit/square.hpp index a18da0b4..e873d92d 100644 --- a/sprout/numeric/dft/fit/square.hpp +++ b/sprout/numeric/dft/fit/square.hpp @@ -6,8 +6,9 @@ #include #include #include -#include -#include +#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/numeric/dft/fit/triangle.hpp b/sprout/numeric/dft/fit/triangle.hpp index e9e3c863..2c70a6ac 100644 --- a/sprout/numeric/dft/fit/triangle.hpp +++ b/sprout/numeric/dft/fit/triangle.hpp @@ -6,8 +6,9 @@ #include #include #include -#include -#include +#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/numeric/dft/fixed/amplitude_spectrum.hpp b/sprout/numeric/dft/fixed/amplitude_spectrum.hpp index 9ad282dc..33a39295 100644 --- a/sprout/numeric/dft/fixed/amplitude_spectrum.hpp +++ b/sprout/numeric/dft/fixed/amplitude_spectrum.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/dft/fixed/dft.hpp b/sprout/numeric/dft/fixed/dft.hpp index e84d10ed..40742cc5 100644 --- a/sprout/numeric/dft/fixed/dft.hpp +++ b/sprout/numeric/dft/fixed/dft.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/dft/fixed/idft.hpp b/sprout/numeric/dft/fixed/idft.hpp index 2c687886..bf0576a6 100644 --- a/sprout/numeric/dft/fixed/idft.hpp +++ b/sprout/numeric/dft/fixed/idft.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/dft/fixed/phase_spectrum.hpp b/sprout/numeric/dft/fixed/phase_spectrum.hpp index ad0fdc73..88d69a5d 100644 --- a/sprout/numeric/dft/fixed/phase_spectrum.hpp +++ b/sprout/numeric/dft/fixed/phase_spectrum.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/dft/fixed/sawtooth.hpp b/sprout/numeric/dft/fixed/sawtooth.hpp index b1eb153c..281f2699 100644 --- a/sprout/numeric/dft/fixed/sawtooth.hpp +++ b/sprout/numeric/dft/fixed/sawtooth.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/dft/fixed/sinusoid.hpp b/sprout/numeric/dft/fixed/sinusoid.hpp index 3d4c09df..058c1082 100644 --- a/sprout/numeric/dft/fixed/sinusoid.hpp +++ b/sprout/numeric/dft/fixed/sinusoid.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/dft/fixed/square.hpp b/sprout/numeric/dft/fixed/square.hpp index f6960b65..afdccb43 100644 --- a/sprout/numeric/dft/fixed/square.hpp +++ b/sprout/numeric/dft/fixed/square.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/dft/fixed/triangle.hpp b/sprout/numeric/dft/fixed/triangle.hpp index 767ba216..84f3f3d7 100644 --- a/sprout/numeric/dft/fixed/triangle.hpp +++ b/sprout/numeric/dft/fixed/triangle.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/numeric/fft/fit/bitrev_table.hpp b/sprout/numeric/fft/fit/bitrev_table.hpp index 51ed2ec0..63fc0b27 100644 --- a/sprout/numeric/fft/fit/bitrev_table.hpp +++ b/sprout/numeric/fft/fit/bitrev_table.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/numeric/fit/adjacent_difference.hpp b/sprout/numeric/fit/adjacent_difference.hpp index d8e02667..946ea6ff 100644 --- a/sprout/numeric/fit/adjacent_difference.hpp +++ b/sprout/numeric/fit/adjacent_difference.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/numeric/fit/iota.hpp b/sprout/numeric/fit/iota.hpp index 62e40934..b9d24f59 100644 --- a/sprout/numeric/fit/iota.hpp +++ b/sprout/numeric/fit/iota.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/numeric/fit/partial_sum.hpp b/sprout/numeric/fit/partial_sum.hpp index 64df4b3a..994600c7 100644 --- a/sprout/numeric/fit/partial_sum.hpp +++ b/sprout/numeric/fit/partial_sum.hpp @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT #include diff --git a/sprout/numeric/fixed/adjacent_difference.hpp b/sprout/numeric/fixed/adjacent_difference.hpp index 81dcb373..6caee337 100644 --- a/sprout/numeric/fixed/adjacent_difference.hpp +++ b/sprout/numeric/fixed/adjacent_difference.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/numeric/fixed/iota.hpp b/sprout/numeric/fixed/iota.hpp index c10f9acc..b2977403 100644 --- a/sprout/numeric/fixed/iota.hpp +++ b/sprout/numeric/fixed/iota.hpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace sprout { namespace fixed { diff --git a/sprout/numeric/fixed/partial_sum.hpp b/sprout/numeric/fixed/partial_sum.hpp index fe1680b0..9744ddf9 100644 --- a/sprout/numeric/fixed/partial_sum.hpp +++ b/sprout/numeric/fixed/partial_sum.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/operation/fit/append.hpp b/sprout/operation/fit/append.hpp index f59902b8..c6c1698b 100644 --- a/sprout/operation/fit/append.hpp +++ b/sprout/operation/fit/append.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/append_back.hpp b/sprout/operation/fit/append_back.hpp index b71ea238..c6bbb299 100644 --- a/sprout/operation/fit/append_back.hpp +++ b/sprout/operation/fit/append_back.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/append_front.hpp b/sprout/operation/fit/append_front.hpp index 8d7222eb..31f8ade9 100644 --- a/sprout/operation/fit/append_front.hpp +++ b/sprout/operation/fit/append_front.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/erase.hpp b/sprout/operation/fit/erase.hpp index bc01ac42..e3bbbda7 100644 --- a/sprout/operation/fit/erase.hpp +++ b/sprout/operation/fit/erase.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/erase_n.hpp b/sprout/operation/fit/erase_n.hpp index d13604cd..45322cba 100644 --- a/sprout/operation/fit/erase_n.hpp +++ b/sprout/operation/fit/erase_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/insert.hpp b/sprout/operation/fit/insert.hpp index 57301e0a..3f737f9f 100644 --- a/sprout/operation/fit/insert.hpp +++ b/sprout/operation/fit/insert.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/insert_n.hpp b/sprout/operation/fit/insert_n.hpp index eebfd981..ff117fc1 100644 --- a/sprout/operation/fit/insert_n.hpp +++ b/sprout/operation/fit/insert_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/pop_back.hpp b/sprout/operation/fit/pop_back.hpp index 1df449c4..c3cebc32 100644 --- a/sprout/operation/fit/pop_back.hpp +++ b/sprout/operation/fit/pop_back.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/pop_back_n.hpp b/sprout/operation/fit/pop_back_n.hpp index 7b2a3cc5..722b648e 100644 --- a/sprout/operation/fit/pop_back_n.hpp +++ b/sprout/operation/fit/pop_back_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/pop_front.hpp b/sprout/operation/fit/pop_front.hpp index 41b3c91b..4c5aa8aa 100644 --- a/sprout/operation/fit/pop_front.hpp +++ b/sprout/operation/fit/pop_front.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/pop_front_n.hpp b/sprout/operation/fit/pop_front_n.hpp index 1f9e6df2..1badd9e9 100644 --- a/sprout/operation/fit/pop_front_n.hpp +++ b/sprout/operation/fit/pop_front_n.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/push_back.hpp b/sprout/operation/fit/push_back.hpp index bddd89cd..f173bc3e 100644 --- a/sprout/operation/fit/push_back.hpp +++ b/sprout/operation/fit/push_back.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/push_back_n.hpp b/sprout/operation/fit/push_back_n.hpp index 8388301e..b2b02373 100644 --- a/sprout/operation/fit/push_back_n.hpp +++ b/sprout/operation/fit/push_back_n.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/push_front.hpp b/sprout/operation/fit/push_front.hpp index 9bb0acae..5f4e5580 100644 --- a/sprout/operation/fit/push_front.hpp +++ b/sprout/operation/fit/push_front.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/push_front_n.hpp b/sprout/operation/fit/push_front_n.hpp index 24b123ba..855b3609 100644 --- a/sprout/operation/fit/push_front_n.hpp +++ b/sprout/operation/fit/push_front_n.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/realign.hpp b/sprout/operation/fit/realign.hpp index f45ba2e1..c0baf2b8 100644 --- a/sprout/operation/fit/realign.hpp +++ b/sprout/operation/fit/realign.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/realign_to.hpp b/sprout/operation/fit/realign_to.hpp index 06c2c4fd..db95144e 100644 --- a/sprout/operation/fit/realign_to.hpp +++ b/sprout/operation/fit/realign_to.hpp @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/resize.hpp b/sprout/operation/fit/resize.hpp index 90065750..3783a16c 100644 --- a/sprout/operation/fit/resize.hpp +++ b/sprout/operation/fit/resize.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/resize_backward.hpp b/sprout/operation/fit/resize_backward.hpp index f7732551..6c09a651 100644 --- a/sprout/operation/fit/resize_backward.hpp +++ b/sprout/operation/fit/resize_backward.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/operation/fit/set.hpp b/sprout/operation/fit/set.hpp index 5bcd86d0..b1e0272e 100644 --- a/sprout/operation/fit/set.hpp +++ b/sprout/operation/fit/set.hpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include +#include namespace sprout { namespace fit { diff --git a/sprout/optional/optional.hpp b/sprout/optional/optional.hpp index 764efe47..6665092c 100644 --- a/sprout/optional/optional.hpp +++ b/sprout/optional/optional.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/sprout/pit.hpp b/sprout/pit.hpp index 71b7bc51..9394d4e7 100644 --- a/sprout/pit.hpp +++ b/sprout/pit.hpp @@ -3,10 +3,10 @@ #include #include +#include #include #include #include -#include #include #endif // #ifndef SPROUT_PIT_HPP diff --git a/sprout/pit/pit.hpp b/sprout/pit/pit.hpp index 09b22693..42a08382 100644 --- a/sprout/pit/pit.hpp +++ b/sprout/pit/pit.hpp @@ -145,4 +145,6 @@ namespace sprout { } } // namespace sprout +#include + #endif // #ifndef SPROUT_PIT_PIT_HPP diff --git a/sprout/random/binomial_distribution.hpp b/sprout/random/binomial_distribution.hpp index b7256972..33129b7c 100644 --- a/sprout/random/binomial_distribution.hpp +++ b/sprout/random/binomial_distribution.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/random/mersenne_twister.hpp b/sprout/random/mersenne_twister.hpp index 28e4887a..c0a3df9c 100644 --- a/sprout/random/mersenne_twister.hpp +++ b/sprout/random/mersenne_twister.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include namespace sprout { diff --git a/sprout/random/shuffle_order.hpp b/sprout/random/shuffle_order.hpp index 24d899d8..0b7495cb 100644 --- a/sprout/random/shuffle_order.hpp +++ b/sprout/random/shuffle_order.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/random/unique_seed.hpp b/sprout/random/unique_seed.hpp index 0de081e6..367f8ba0 100644 --- a/sprout/random/unique_seed.hpp +++ b/sprout/random/unique_seed.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/adaptor/alternated.hpp b/sprout/range/adaptor/alternated.hpp index 58ec33bf..c9603d7d 100644 --- a/sprout/range/adaptor/alternated.hpp +++ b/sprout/range/adaptor/alternated.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/range/adaptor/copied.hpp b/sprout/range/adaptor/copied.hpp index 76d0c212..b4b78e97 100644 --- a/sprout/range/adaptor/copied.hpp +++ b/sprout/range/adaptor/copied.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/adaptor/detail/adapted_range_default.hpp b/sprout/range/adaptor/detail/adapted_range_default.hpp index dbbdc4a5..89e3227b 100644 --- a/sprout/range/adaptor/detail/adapted_range_default.hpp +++ b/sprout/range/adaptor/detail/adapted_range_default.hpp @@ -2,7 +2,7 @@ #define SPROUT_RANGE_ADAPTOR_DETAIL_ADAPTED_RANGE_DEFAULT_HPP #include -#include +#include #include #include #include diff --git a/sprout/range/adaptor/detail/jointed_range_default.hpp b/sprout/range/adaptor/detail/jointed_range_default.hpp index 63ce2396..319dfb35 100644 --- a/sprout/range/adaptor/detail/jointed_range_default.hpp +++ b/sprout/range/adaptor/detail/jointed_range_default.hpp @@ -2,7 +2,7 @@ #define SPROUT_RANGE_ADAPTOR_DETAIL_JOINTED_RANGE_DEFAULT_HPP #include -#include +#include #include #include #include diff --git a/sprout/range/adaptor/detail/sized_range_default.hpp b/sprout/range/adaptor/detail/sized_range_default.hpp index 4074a8c4..abc929fc 100644 --- a/sprout/range/adaptor/detail/sized_range_default.hpp +++ b/sprout/range/adaptor/detail/sized_range_default.hpp @@ -2,7 +2,7 @@ #define SPROUT_RANGE_ADAPTOR_DETAIL_SIZED_RANGE_DEFAULT_HPP #include -#include +#include #include #include #include diff --git a/sprout/range/adaptor/jointed.hpp b/sprout/range/adaptor/jointed.hpp index b0d1aa98..f5161fd4 100644 --- a/sprout/range/adaptor/jointed.hpp +++ b/sprout/range/adaptor/jointed.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/adaptor/merged.hpp b/sprout/range/adaptor/merged.hpp index 0bacdc04..5dd93b7c 100644 --- a/sprout/range/adaptor/merged.hpp +++ b/sprout/range/adaptor/merged.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/adaptor/set_difference.hpp b/sprout/range/adaptor/set_difference.hpp index 3f309b65..78f45dc9 100644 --- a/sprout/range/adaptor/set_difference.hpp +++ b/sprout/range/adaptor/set_difference.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/adaptor/set_intersection.hpp b/sprout/range/adaptor/set_intersection.hpp index 43dc186b..6ccf9c1c 100644 --- a/sprout/range/adaptor/set_intersection.hpp +++ b/sprout/range/adaptor/set_intersection.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/adaptor/set_symmetric_difference.hpp b/sprout/range/adaptor/set_symmetric_difference.hpp index f93adf71..625bed23 100644 --- a/sprout/range/adaptor/set_symmetric_difference.hpp +++ b/sprout/range/adaptor/set_symmetric_difference.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/adaptor/set_union.hpp b/sprout/range/adaptor/set_union.hpp index 79703fdc..45e5af27 100644 --- a/sprout/range/adaptor/set_union.hpp +++ b/sprout/range/adaptor/set_union.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/adaptor/transformed.hpp b/sprout/range/adaptor/transformed.hpp index ed8e18f6..5ba44e90 100644 --- a/sprout/range/adaptor/transformed.hpp +++ b/sprout/range/adaptor/transformed.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace sprout { namespace adaptors { diff --git a/sprout/range/algorithm/find_difference.hpp b/sprout/range/algorithm/find_difference.hpp index fbfd6581..6c23a49b 100644 --- a/sprout/range/algorithm/find_difference.hpp +++ b/sprout/range/algorithm/find_difference.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/find_intersection.hpp b/sprout/range/algorithm/find_intersection.hpp index 1f6419bb..8f66ab90 100644 --- a/sprout/range/algorithm/find_intersection.hpp +++ b/sprout/range/algorithm/find_intersection.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/find_symmetric_difference.hpp b/sprout/range/algorithm/find_symmetric_difference.hpp index 4ee06164..5a621c4f 100644 --- a/sprout/range/algorithm/find_symmetric_difference.hpp +++ b/sprout/range/algorithm/find_symmetric_difference.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/minmax_element.hpp b/sprout/range/algorithm/minmax_element.hpp index f0dfcaea..5a79e678 100644 --- a/sprout/range/algorithm/minmax_element.hpp +++ b/sprout/range/algorithm/minmax_element.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/mismatch.hpp b/sprout/range/algorithm/mismatch.hpp index b1ab2513..2ec7476b 100644 --- a/sprout/range/algorithm/mismatch.hpp +++ b/sprout/range/algorithm/mismatch.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/next_difference.hpp b/sprout/range/algorithm/next_difference.hpp index 7d88d714..8fbf9342 100644 --- a/sprout/range/algorithm/next_difference.hpp +++ b/sprout/range/algorithm/next_difference.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/next_intersection.hpp b/sprout/range/algorithm/next_intersection.hpp index e0f4935d..767edead 100644 --- a/sprout/range/algorithm/next_intersection.hpp +++ b/sprout/range/algorithm/next_intersection.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/next_symmetric_difference.hpp b/sprout/range/algorithm/next_symmetric_difference.hpp index 3826aa3e..efc6a560 100644 --- a/sprout/range/algorithm/next_symmetric_difference.hpp +++ b/sprout/range/algorithm/next_symmetric_difference.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/range/algorithm/next_union.hpp b/sprout/range/algorithm/next_union.hpp index 883d6c4b..a99dd004 100644 --- a/sprout/range/algorithm/next_union.hpp +++ b/sprout/range/algorithm/next_union.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/string/shrink.hpp b/sprout/string/shrink.hpp index 370a179a..3fdcdd16 100644 --- a/sprout/string/shrink.hpp +++ b/sprout/string/shrink.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT namespace sprout { diff --git a/sprout/string/string.hpp b/sprout/string/string.hpp index 8e6a64c3..e4853a61 100644 --- a/sprout/string/string.hpp +++ b/sprout/string/string.hpp @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/sprout/sub_array/sub.hpp b/sprout/sub_array/sub.hpp index 78786c00..a95f684c 100644 --- a/sprout/sub_array/sub.hpp +++ b/sprout/sub_array/sub.hpp @@ -6,7 +6,6 @@ #include #include #include -#include #include namespace sprout { diff --git a/sprout/sub_array/sub_array.hpp b/sprout/sub_array/sub_array.hpp index 01001c14..995f3eec 100644 --- a/sprout/sub_array/sub_array.hpp +++ b/sprout/sub_array/sub_array.hpp @@ -369,4 +369,6 @@ namespace sprout { } } // namespace sprout +#include + #endif // #ifndef SPROUT_SUB_ARRAY_SUB_ARRAY_HPP diff --git a/sprout/sub_array/tuple.hpp b/sprout/sub_array/tuple.hpp index dd28f0d0..790d02d6 100644 --- a/sprout/sub_array/tuple.hpp +++ b/sprout/sub_array/tuple.hpp @@ -10,7 +10,6 @@ #include #include #include -#include #include namespace sprout { diff --git a/sprout/utility/pair/comparison.hpp b/sprout/utility/pair/comparison.hpp index 44314357..34f2fae4 100644 --- a/sprout/utility/pair/comparison.hpp +++ b/sprout/utility/pair/comparison.hpp @@ -5,32 +5,32 @@ #include namespace sprout { - template + template inline SPROUT_CONSTEXPR bool operator==(sprout::pair const& x, sprout::pair const& y) { return x.first == y.first && x.second == y.second; } - template + template inline SPROUT_CONSTEXPR bool operator!=(sprout::pair const& x, sprout::pair const& y) { return !(x == y); } - template + template inline SPROUT_CONSTEXPR bool operator<(sprout::pair const& x, sprout::pair const& y) { - return x.first < y.first || (!(y.first < x.first) && x.second < y.second); + return ((x.first) < (y.first)) || (!((y.first) < (x.first)) && ((x.second) < (y.second))); } - template + template inline SPROUT_CONSTEXPR bool operator>(sprout::pair const& x, sprout::pair const& y) { return y < x; } - template + template inline SPROUT_CONSTEXPR bool operator<=(sprout::pair const& x, sprout::pair const& y) { return !(y < x); } - template + template inline SPROUT_CONSTEXPR bool operator>=(sprout::pair const& x, sprout::pair const& y) { return !(x < y); diff --git a/sprout/uuid/detail/table.hpp b/sprout/uuid/detail/table.hpp index d136212e..622c415e 100644 --- a/sprout/uuid/detail/table.hpp +++ b/sprout/uuid/detail/table.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include namespace sprout { diff --git a/sprout/variant/as_variant_visitor.hpp b/sprout/variant/as_variant_visitor.hpp index 24e8b0b2..5aa6da0a 100644 --- a/sprout/variant/as_variant_visitor.hpp +++ b/sprout/variant/as_variant_visitor.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/variant/as_visitor.hpp b/sprout/variant/as_visitor.hpp index 85b298ad..9577714a 100644 --- a/sprout/variant/as_visitor.hpp +++ b/sprout/variant/as_visitor.hpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/attr_cnv/result_of/bitwise_or.hpp b/sprout/weed/attr_cnv/result_of/bitwise_or.hpp index 57127b97..f8f734ea 100644 --- a/sprout/weed/attr_cnv/result_of/bitwise_or.hpp +++ b/sprout/weed/attr_cnv/result_of/bitwise_or.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/attr_cnv/result_of/shift_left.hpp b/sprout/weed/attr_cnv/result_of/shift_left.hpp index 16befd6c..5167b3c6 100644 --- a/sprout/weed/attr_cnv/result_of/shift_left.hpp +++ b/sprout/weed/attr_cnv/result_of/shift_left.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/attr_cnv/result_of/times.hpp b/sprout/weed/attr_cnv/result_of/times.hpp index 947d1ae6..5ec3ab4f 100644 --- a/sprout/weed/attr_cnv/result_of/times.hpp +++ b/sprout/weed/attr_cnv/result_of/times.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/attr_cnv/times.hpp b/sprout/weed/attr_cnv/times.hpp index 3d4f3a71..1a45cd14 100644 --- a/sprout/weed/attr_cnv/times.hpp +++ b/sprout/weed/attr_cnv/times.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/detail/bdigits.hpp b/sprout/weed/detail/bdigits.hpp index 3b63f9a3..f142ad65 100644 --- a/sprout/weed/detail/bdigits.hpp +++ b/sprout/weed/detail/bdigits.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/detail/digits.hpp b/sprout/weed/detail/digits.hpp index a56ad241..b398b2e3 100644 --- a/sprout/weed/detail/digits.hpp +++ b/sprout/weed/detail/digits.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/detail/odigits.hpp b/sprout/weed/detail/odigits.hpp index 0c59b129..4fdeba25 100644 --- a/sprout/weed/detail/odigits.hpp +++ b/sprout/weed/detail/odigits.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/detail/xdigits.hpp b/sprout/weed/detail/xdigits.hpp index 8b6f3762..40c4d69d 100644 --- a/sprout/weed/detail/xdigits.hpp +++ b/sprout/weed/detail/xdigits.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sprout/weed/parser/directive/as_array.hpp b/sprout/weed/parser/directive/as_array.hpp index 7ddc1e95..84171859 100644 --- a/sprout/weed/parser/directive/as_array.hpp +++ b/sprout/weed/parser/directive/as_array.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/sprout/weed/traits/type/is_container.hpp b/sprout/weed/traits/type/is_container.hpp index 03d5c4e4..b3d1b3bd 100644 --- a/sprout/weed/traits/type/is_container.hpp +++ b/sprout/weed/traits/type/is_container.hpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace sprout { namespace weed {