diff --git a/libs/algorithm/test/adjacent_find.cpp b/libs/algorithm/test/adjacent_find.cpp index 4c56b7b0..59084f9d 100644 --- a/libs/algorithm/test/adjacent_find.cpp +++ b/libs/algorithm/test/adjacent_find.cpp @@ -83,7 +83,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::adjacent_find( testspr::reduct_random_access(sprout::begin(arr1)), @@ -115,7 +114,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/all_of.cpp b/libs/algorithm/test/all_of.cpp index 8ec4c5e5..75ba24d8 100644 --- a/libs/algorithm/test/all_of.cpp +++ b/libs/algorithm/test/all_of.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::all_of( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/all_of_equal.cpp b/libs/algorithm/test/all_of_equal.cpp index 5ce1a986..70ac231b 100644 --- a/libs/algorithm/test/all_of_equal.cpp +++ b/libs/algorithm/test/all_of_equal.cpp @@ -53,7 +53,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::all_of_equal( testspr::reduct_random_access(sprout::begin(arr1)), @@ -70,7 +69,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/any_of.cpp b/libs/algorithm/test/any_of.cpp index 2ef79a17..b3e117ef 100644 --- a/libs/algorithm/test/any_of.cpp +++ b/libs/algorithm/test/any_of.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::any_of( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/any_of_equal.cpp b/libs/algorithm/test/any_of_equal.cpp index cf57de9d..6ed4fef4 100644 --- a/libs/algorithm/test/any_of_equal.cpp +++ b/libs/algorithm/test/any_of_equal.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::any_of_equal( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/binary_search.cpp b/libs/algorithm/test/binary_search.cpp index 2e233019..2bb81e60 100644 --- a/libs/algorithm/test/binary_search.cpp +++ b/libs/algorithm/test/binary_search.cpp @@ -37,7 +37,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::binary_search( testspr::reduct_forward(sprout::begin(arr1)), @@ -55,9 +54,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::binary_search( testspr::reduct_random_access(sprout::begin(arr1)), @@ -75,7 +72,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/count.cpp b/libs/algorithm/test/count.cpp index 00aecfcc..db175535 100644 --- a/libs/algorithm/test/count.cpp +++ b/libs/algorithm/test/count.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result == 0); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::count( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result == 0); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/count_if.cpp b/libs/algorithm/test/count_if.cpp index 2272d3b2..7e19a24d 100644 --- a/libs/algorithm/test/count_if.cpp +++ b/libs/algorithm/test/count_if.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result == 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::count_if( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result == 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/equal.cpp b/libs/algorithm/test/equal.cpp index 961a4026..f479336b 100644 --- a/libs/algorithm/test/equal.cpp +++ b/libs/algorithm/test/equal.cpp @@ -161,7 +161,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::equal( testspr::reduct_random_access(sprout::begin(arr1)), @@ -231,7 +230,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif { SPROUT_STATIC_CONSTEXPR auto result = sprout::equal( @@ -388,7 +386,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::equal( testspr::reduct_random_access(sprout::begin(arr1)), @@ -466,7 +463,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/equal_range.cpp b/libs/algorithm/test/equal_range.cpp index b1fe1c0b..cd9be6b0 100644 --- a/libs/algorithm/test/equal_range.cpp +++ b/libs/algorithm/test/equal_range.cpp @@ -64,7 +64,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(sprout::distance(found.first.base(), found.second.base()) == 0); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::equal_range( testspr::reduct_random_access(sprout::begin(arr1)), @@ -86,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found.second.base() == sprout::begin(arr1) + 5); TESTSPR_BOTH_ASSERT(sprout::distance(found.first.base(), found.second.base()) == 0); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/find.cpp b/libs/algorithm/test/find.cpp index 6d31ce9f..c3007a33 100644 --- a/libs/algorithm/test/find.cpp +++ b/libs/algorithm/test/find.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::find( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/find_end.cpp b/libs/algorithm/test/find_end.cpp index 68dddc7a..119057b2 100644 --- a/libs/algorithm/test/find_end.cpp +++ b/libs/algorithm/test/find_end.cpp @@ -177,7 +177,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::find_end( testspr::reduct_random_access(sprout::begin(arr1)), @@ -218,7 +217,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/find_first_of.cpp b/libs/algorithm/test/find_first_of.cpp index e672a041..4753147c 100644 --- a/libs/algorithm/test/find_first_of.cpp +++ b/libs/algorithm/test/find_first_of.cpp @@ -177,7 +177,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::find_first_of( testspr::reduct_random_access(sprout::begin(arr1)), @@ -255,7 +254,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/find_if.cpp b/libs/algorithm/test/find_if.cpp index 0b26da28..1adebd49 100644 --- a/libs/algorithm/test/find_if.cpp +++ b/libs/algorithm/test/find_if.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::find_if( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/find_if_not.cpp b/libs/algorithm/test/find_if_not.cpp index 4beacc28..0fcfa836 100644 --- a/libs/algorithm/test/find_if_not.cpp +++ b/libs/algorithm/test/find_if_not.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::find_if_not( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/includes.cpp b/libs/algorithm/test/includes.cpp index 64df349d..ff886f83 100644 --- a/libs/algorithm/test/includes.cpp +++ b/libs/algorithm/test/includes.cpp @@ -99,7 +99,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::includes( testspr::reduct_input(sprout::begin(arr1)), @@ -177,9 +176,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::includes( testspr::reduct_random_access(sprout::begin(arr1)), @@ -257,7 +254,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_decreasing.cpp b/libs/algorithm/test/is_decreasing.cpp index 4ea6c9df..5e1cb284 100644 --- a/libs/algorithm/test/is_decreasing.cpp +++ b/libs/algorithm/test/is_decreasing.cpp @@ -34,7 +34,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_decreasing( testspr::reduct_forward(sprout::begin(arr1)), @@ -49,9 +48,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_decreasing( testspr::reduct_random_access(sprout::begin(arr1)), @@ -66,7 +63,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_heap.cpp b/libs/algorithm/test/is_heap.cpp index d66fb3f3..b9686e86 100644 --- a/libs/algorithm/test/is_heap.cpp +++ b/libs/algorithm/test/is_heap.cpp @@ -81,7 +81,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_heap( testspr::reduct_random_access(sprout::begin(arr1)), @@ -142,7 +141,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_heap_until.cpp b/libs/algorithm/test/is_heap_until.cpp index 8e4696ac..d51c9917 100644 --- a/libs/algorithm/test/is_heap_until.cpp +++ b/libs/algorithm/test/is_heap_until.cpp @@ -81,7 +81,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr2) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::is_heap_until( testspr::reduct_random_access(sprout::begin(arr1)), @@ -142,7 +141,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr2) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_increasing.cpp b/libs/algorithm/test/is_increasing.cpp index 5955a256..da897907 100644 --- a/libs/algorithm/test/is_increasing.cpp +++ b/libs/algorithm/test/is_increasing.cpp @@ -34,7 +34,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_increasing( testspr::reduct_forward(sprout::begin(arr1)), @@ -49,9 +48,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_increasing( testspr::reduct_random_access(sprout::begin(arr1)), @@ -66,7 +63,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_partitioned.cpp b/libs/algorithm/test/is_partitioned.cpp index 5b54410b..04967295 100644 --- a/libs/algorithm/test/is_partitioned.cpp +++ b/libs/algorithm/test/is_partitioned.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_partitioned( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_permutation.cpp b/libs/algorithm/test/is_permutation.cpp index cb707c93..b32ffe20 100644 --- a/libs/algorithm/test/is_permutation.cpp +++ b/libs/algorithm/test/is_permutation.cpp @@ -161,7 +161,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_permutation( testspr::reduct_random_access(sprout::begin(arr1)), @@ -231,7 +230,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_permutation( @@ -389,7 +387,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_permutation( testspr::reduct_random_access(sprout::begin(arr1)), @@ -467,7 +464,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_sorted.cpp b/libs/algorithm/test/is_sorted.cpp index cdaa5aa7..15166f9f 100644 --- a/libs/algorithm/test/is_sorted.cpp +++ b/libs/algorithm/test/is_sorted.cpp @@ -50,7 +50,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_sorted( testspr::reduct_forward(sprout::begin(arr1)), @@ -81,9 +80,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_sorted( testspr::reduct_random_access(sprout::begin(arr1)), @@ -114,7 +111,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_sorted_until.cpp b/libs/algorithm/test/is_sorted_until.cpp index 43c62187..e66b7e20 100644 --- a/libs/algorithm/test/is_sorted_until.cpp +++ b/libs/algorithm/test/is_sorted_until.cpp @@ -81,7 +81,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::is_sorted_until( testspr::reduct_random_access(sprout::begin(arr1)), @@ -112,7 +111,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_strictly_decreasing.cpp b/libs/algorithm/test/is_strictly_decreasing.cpp index d6601dcb..f3d9587d 100644 --- a/libs/algorithm/test/is_strictly_decreasing.cpp +++ b/libs/algorithm/test/is_strictly_decreasing.cpp @@ -49,7 +49,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_strictly_decreasing( testspr::reduct_forward(sprout::begin(arr1)), @@ -78,9 +77,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_strictly_decreasing( testspr::reduct_random_access(sprout::begin(arr1)), @@ -109,7 +106,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/is_strictly_increasing.cpp b/libs/algorithm/test/is_strictly_increasing.cpp index 0b3922f3..93f07d37 100644 --- a/libs/algorithm/test/is_strictly_increasing.cpp +++ b/libs/algorithm/test/is_strictly_increasing.cpp @@ -49,7 +49,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_strictly_increasing( testspr::reduct_forward(sprout::begin(arr1)), @@ -78,9 +77,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::is_strictly_increasing( testspr::reduct_random_access(sprout::begin(arr1)), @@ -109,7 +106,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/lexicographical_compare.cpp b/libs/algorithm/test/lexicographical_compare.cpp index 5684bc93..86e820fc 100644 --- a/libs/algorithm/test/lexicographical_compare.cpp +++ b/libs/algorithm/test/lexicographical_compare.cpp @@ -156,7 +156,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::lexicographical_compare( testspr::reduct_input(sprout::begin(arr1)), @@ -290,9 +289,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::lexicographical_compare( testspr::reduct_random_access(sprout::begin(arr1)), @@ -426,7 +423,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/lower_bound.cpp b/libs/algorithm/test/lower_bound.cpp index 6ed91867..829206e5 100644 --- a/libs/algorithm/test/lower_bound.cpp +++ b/libs/algorithm/test/lower_bound.cpp @@ -55,7 +55,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::lower_bound( testspr::reduct_random_access(sprout::begin(arr1)), @@ -73,7 +72,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/max_element.cpp b/libs/algorithm/test/max_element.cpp index c20af774..649dd03f 100644 --- a/libs/algorithm/test/max_element.cpp +++ b/libs/algorithm/test/max_element.cpp @@ -81,7 +81,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 4); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::max_element( testspr::reduct_random_access(sprout::begin(arr1)), @@ -112,7 +111,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 4); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/min_element.cpp b/libs/algorithm/test/min_element.cpp index e4d09206..48f5fc59 100644 --- a/libs/algorithm/test/min_element.cpp +++ b/libs/algorithm/test/min_element.cpp @@ -81,7 +81,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 3); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::min_element( testspr::reduct_random_access(sprout::begin(arr1)), @@ -112,7 +111,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 3); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/minmax_element.cpp b/libs/algorithm/test/minmax_element.cpp index 4c677362..cbcf0104 100644 --- a/libs/algorithm/test/minmax_element.cpp +++ b/libs/algorithm/test/minmax_element.cpp @@ -89,7 +89,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result.second.base() == sprout::begin(arr1) + 4); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax_element( testspr::reduct_random_access(sprout::begin(arr1)), @@ -124,7 +123,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result.first.base() == sprout::begin(arr1) + 3); TESTSPR_BOTH_ASSERT(result.second.base() == sprout::begin(arr1) + 4); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/mismatch.cpp b/libs/algorithm/test/mismatch.cpp index cf6de4bf..b0706369 100644 --- a/libs/algorithm/test/mismatch.cpp +++ b/libs/algorithm/test/mismatch.cpp @@ -177,7 +177,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found.second.base() == sprout::begin(arr2)); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::mismatch( testspr::reduct_random_access(sprout::begin(arr1)), @@ -255,7 +254,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found.first.base() == sprout::begin(arr1)); TESTSPR_BOTH_ASSERT(found.second.base() == sprout::begin(arr2)); } -#endif { SPROUT_STATIC_CONSTEXPR auto found = sprout::mismatch( @@ -429,7 +427,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found.second.base() == sprout::begin(arr2)); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::mismatch( testspr::reduct_random_access(sprout::begin(arr1)), @@ -515,7 +512,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found.first.base() == sprout::begin(arr1)); TESTSPR_BOTH_ASSERT(found.second.base() == sprout::begin(arr2)); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/none_of.cpp b/libs/algorithm/test/none_of.cpp index 4a8ebb6e..f3b1d25a 100644 --- a/libs/algorithm/test/none_of.cpp +++ b/libs/algorithm/test/none_of.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::none_of( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/none_of_equal.cpp b/libs/algorithm/test/none_of_equal.cpp index 0fe427e4..b24bd7d0 100644 --- a/libs/algorithm/test/none_of_equal.cpp +++ b/libs/algorithm/test/none_of_equal.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::none_of_equal( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/one_of.cpp b/libs/algorithm/test/one_of.cpp index dc1272c2..8c6c3165 100644 --- a/libs/algorithm/test/one_of.cpp +++ b/libs/algorithm/test/one_of.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::one_of( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/one_of_equal.cpp b/libs/algorithm/test/one_of_equal.cpp index ae5781ac..becb8348 100644 --- a/libs/algorithm/test/one_of_equal.cpp +++ b/libs/algorithm/test/one_of_equal.cpp @@ -85,7 +85,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(!result); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::one_of_equal( testspr::reduct_random_access(sprout::begin(arr1)), @@ -118,7 +117,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(!result); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/partition_point.cpp b/libs/algorithm/test/partition_point.cpp index 0eaf60d9..6af109bf 100644 --- a/libs/algorithm/test/partition_point.cpp +++ b/libs/algorithm/test/partition_point.cpp @@ -53,7 +53,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::partition_point( testspr::reduct_random_access(sprout::begin(arr1)), @@ -70,7 +69,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/search.cpp b/libs/algorithm/test/search.cpp index 4ce13c99..5e9c3077 100644 --- a/libs/algorithm/test/search.cpp +++ b/libs/algorithm/test/search.cpp @@ -177,7 +177,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::search( testspr::reduct_random_access(sprout::begin(arr1)), @@ -255,7 +254,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/search_n.cpp b/libs/algorithm/test/search_n.cpp index e201aee1..7b6a6183 100644 --- a/libs/algorithm/test/search_n.cpp +++ b/libs/algorithm/test/search_n.cpp @@ -175,7 +175,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::search_n( testspr::reduct_random_access(sprout::begin(arr1)), @@ -253,7 +252,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/tristate_lexicographical_compare.cpp b/libs/algorithm/test/tristate_lexicographical_compare.cpp index 094b6a73..a2640f96 100644 --- a/libs/algorithm/test/tristate_lexicographical_compare.cpp +++ b/libs/algorithm/test/tristate_lexicographical_compare.cpp @@ -156,7 +156,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(result > 0); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::tristate_lexicographical_compare( testspr::reduct_input(sprout::begin(arr1)), @@ -290,9 +289,7 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result > 0); } -#endif -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto result = sprout::tristate_lexicographical_compare( testspr::reduct_random_access(sprout::begin(arr1)), @@ -426,7 +423,6 @@ namespace testspr { ); TESTSPR_BOTH_ASSERT(result > 0); } -#endif } } } // namespace testspr diff --git a/libs/algorithm/test/upper_bound.cpp b/libs/algorithm/test/upper_bound.cpp index c18f8098..750e1b58 100644 --- a/libs/algorithm/test/upper_bound.cpp +++ b/libs/algorithm/test/upper_bound.cpp @@ -55,7 +55,6 @@ namespace testspr { TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#if defined(__clang__) { SPROUT_STATIC_CONSTEXPR auto found = sprout::upper_bound( testspr::reduct_random_access(sprout::begin(arr1)), @@ -73,7 +72,6 @@ namespace testspr { ).base(); TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5); } -#endif } } } // namespace testspr diff --git a/sprout/algorithm/find_end.hpp b/sprout/algorithm/find_end.hpp index 0ee55e4a..00519edb 100644 --- a/sprout/algorithm/find_end.hpp +++ b/sprout/algorithm/find_end.hpp @@ -19,70 +19,71 @@ namespace sprout { namespace detail { - template - inline SPROUT_CONSTEXPR RandomAccessIterator1 - find_end_impl_check_ra(RandomAccessIterator1 first1, RandomAccessIterator1 result, RandomAccessIterator1 searched) { - return searched == first1 ? searched - : result - ; - } - template - inline SPROUT_CONSTEXPR RandomAccessIterator1 - find_end_impl_ra( - RandomAccessIterator1 first1, RandomAccessIterator1 last1, - ForwardIterator2 first2, ForwardIterator2 last2, - BinaryPredicate pred, - typename std::iterator_traits::difference_type pivot, RandomAccessIterator1 last1_, RandomAccessIterator1 result, - RandomAccessIterator1 searched - ) - { - return searched == last1_ ? result - : searched < first1 ? pivot == 0 - ? sprout::detail::find_end_impl_check_ra( - first1, searched, - sprout::detail::search_one(first1, last1_, first2, last2, pred) - ) - : sprout::detail::find_end_impl_ra( - sprout::next(first1, pivot), last1, first2, last2, pred, - (sprout::distance(first1, last1) - pivot) / 2, last1_, searched, - sprout::detail::find_end_impl_ra( - first1, sprout::next(first1, pivot), first2, last2, pred, - pivot / 2, last1_, searched, - first1 - ) - ) - : pivot == 0 ? sprout::detail::search_one(first1, last1_, first2, last2, pred) - : sprout::detail::find_end_impl_ra( - sprout::next(first1, pivot), last1, first2, last2, pred, - (sprout::distance(first1, last1) - pivot) / 2, last1_, result, - sprout::detail::find_end_impl_ra( - first1, sprout::next(first1, pivot), first2, last2, pred, - pivot / 2, last1_, result, - first1 - ) - ) - ; - } - template - inline SPROUT_CONSTEXPR typename std::enable_if< - sprout::is_constant_distance_iterator::value, - RandomAccessIterator1 - >::type - find_end( - RandomAccessIterator1 first1, RandomAccessIterator1 last1, - ForwardIterator2 first2, ForwardIterator2 last2, - BinaryPredicate pred, - std::random_access_iterator_tag* - ) - { - return first1 == last1 ? last1 - : sprout::detail::find_end_impl_ra( - first1, last1, first2, last2, pred, - sprout::distance(first1, last1) / 2, last1, last1, - first1 - ) - ; - } + // !!! +// template +// inline SPROUT_CONSTEXPR RandomAccessIterator1 +// find_end_impl_check_ra(RandomAccessIterator1 first1, RandomAccessIterator1 result, RandomAccessIterator1 searched) { +// return searched == first1 ? searched +// : result +// ; +// } +// template +// inline SPROUT_CONSTEXPR RandomAccessIterator1 +// find_end_impl_ra( +// RandomAccessIterator1 first1, RandomAccessIterator1 last1, +// ForwardIterator2 first2, ForwardIterator2 last2, +// BinaryPredicate pred, +// typename std::iterator_traits::difference_type pivot, RandomAccessIterator1 last1_, RandomAccessIterator1 result, +// RandomAccessIterator1 searched +// ) +// { +// return searched == last1_ ? result +// : searched < first1 ? pivot == 0 +// ? sprout::detail::find_end_impl_check_ra( +// first1, searched, +// sprout::detail::search_one(first1, last1_, first2, last2, pred) +// ) +// : sprout::detail::find_end_impl_ra( +// sprout::next(first1, pivot), last1, first2, last2, pred, +// (sprout::distance(first1, last1) - pivot) / 2, last1_, searched, +// sprout::detail::find_end_impl_ra( +// first1, sprout::next(first1, pivot), first2, last2, pred, +// pivot / 2, last1_, searched, +// first1 +// ) +// ) +// : pivot == 0 ? sprout::detail::search_one(first1, last1_, first2, last2, pred) +// : sprout::detail::find_end_impl_ra( +// sprout::next(first1, pivot), last1, first2, last2, pred, +// (sprout::distance(first1, last1) - pivot) / 2, last1_, result, +// sprout::detail::find_end_impl_ra( +// first1, sprout::next(first1, pivot), first2, last2, pred, +// pivot / 2, last1_, result, +// first1 +// ) +// ) +// ; +// } +// template +// inline SPROUT_CONSTEXPR typename std::enable_if< +// sprout::is_constant_distance_iterator::value, +// RandomAccessIterator1 +// >::type +// find_end( +// RandomAccessIterator1 first1, RandomAccessIterator1 last1, +// ForwardIterator2 first2, ForwardIterator2 last2, +// BinaryPredicate pred, +// std::random_access_iterator_tag* +// ) +// { +// return first1 == last1 ? last1 +// : sprout::detail::find_end_impl_ra( +// first1, last1, first2, last2, pred, +// sprout::distance(first1, last1) / 2, last1, last1, +// first1 +// ) +// ; +// } template inline SPROUT_CONSTEXPR sprout::pair diff --git a/sprout/algorithm/fixed/next_permutation.hpp b/sprout/algorithm/fixed/next_permutation.hpp index 7579148d..cd2ac0ac 100644 --- a/sprout/algorithm/fixed/next_permutation.hpp +++ b/sprout/algorithm/fixed/next_permutation.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/sprout/algorithm/fixed/prev_permutation.hpp b/sprout/algorithm/fixed/prev_permutation.hpp index 6a53e8b7..3d357c6f 100644 --- a/sprout/algorithm/fixed/prev_permutation.hpp +++ b/sprout/algorithm/fixed/prev_permutation.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/sprout/workaround/recursive_function_template.hpp b/sprout/workaround/recursive_function_template.hpp index 72f98b04..b7a50034 100644 --- a/sprout/workaround/recursive_function_template.hpp +++ b/sprout/workaround/recursive_function_template.hpp @@ -20,7 +20,7 @@ // #ifndef SPROUT_RECURSIVE_FUNCTION_TEMPLATE_INSTANTIATION_LIMIT # if defined(__clang__) -# if (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_major__ <= 2)) +# if (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 2)) # define SPROUT_RECURSIVE_FUNCTION_TEMPLATE_INSTANTIATION_LIMIT 512 # else # define SPROUT_RECURSIVE_FUNCTION_TEMPLATE_INSTANTIATION_LIMIT 256