diff --git a/sprout/adl/not_found.hpp b/sprout/adl/not_found.hpp index f3638597..b9f4a0e3 100644 --- a/sprout/adl/not_found.hpp +++ b/sprout/adl/not_found.hpp @@ -8,8 +8,9 @@ #ifndef SPROUT_ADL_NOT_FOUND_HPP #define SPROUT_ADL_NOT_FOUND_HPP -#include #include +#include +#include namespace sprout { // @@ -22,7 +23,7 @@ namespace sprout { // template struct is_not_found_via_adl - : public std::is_same + : public sprout::is_same {}; template struct is_not_found_via_adl @@ -42,7 +43,7 @@ namespace sprout { // template struct is_found_via_adl - : public std::integral_constant::value> + : public sprout::integral_constant::value> {}; } // namespace sprout diff --git a/sprout/algorithm/string/join.hpp b/sprout/algorithm/string/join.hpp index be9e282f..5245010f 100644 --- a/sprout/algorithm/string/join.hpp +++ b/sprout/algorithm/string/join.hpp @@ -19,6 +19,7 @@ #include #include #include +#include #include namespace sprout { @@ -31,7 +32,7 @@ namespace sprout { String, typename std::enable_if::value>::type > - : public std::integral_constant< + : public sprout::integral_constant< typename sprout::container_traits::size_type, sprout::container_traits::static_size - 1 > @@ -41,7 +42,7 @@ namespace sprout { String, typename std::enable_if::value>::type > - : public std::integral_constant< + : public sprout::integral_constant< typename sprout::container_traits::size_type, sprout::container_traits::static_size > diff --git a/sprout/array/tuple.hpp b/sprout/array/tuple.hpp index 66bc55a0..bcaae52e 100644 --- a/sprout/array/tuple.hpp +++ b/sprout/array/tuple.hpp @@ -10,11 +10,11 @@ #include #include -#include #include #include #include #include +#include namespace sprout { // @@ -49,7 +49,7 @@ namespace std { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/array/type_traits.hpp b/sprout/array/type_traits.hpp index ba9f9e90..d967b273 100644 --- a/sprout/array/type_traits.hpp +++ b/sprout/array/type_traits.hpp @@ -9,9 +9,9 @@ #define SPROUT_ARRAY_TYPE_TRAITS_HPP #include -#include #include #include +#include namespace sprout { // @@ -19,7 +19,7 @@ namespace sprout { // template struct is_array_class - : public std::false_type + : public sprout::false_type {}; template struct is_array_class @@ -31,7 +31,7 @@ namespace sprout { {}; template struct is_array_class > - : public std::true_type + : public sprout::true_type {}; } // namespace sprout diff --git a/sprout/bitset/bitset.hpp b/sprout/bitset/bitset.hpp index e54cbab6..e87b4355 100644 --- a/sprout/bitset/bitset.hpp +++ b/sprout/bitset/bitset.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -36,11 +37,6 @@ namespace sprout { namespace detail { - template - struct sizeof_ - : public std::integral_constant - {}; - struct base_bitset_from_words_construct_tag {}; template diff --git a/sprout/compressed_pair.hpp b/sprout/compressed_pair.hpp index c6115eef..1b17adc0 100644 --- a/sprout/compressed_pair.hpp +++ b/sprout/compressed_pair.hpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace sprout { namespace detail { @@ -19,27 +20,27 @@ namespace sprout { struct compressed_pair_switch; template struct compressed_pair_switch - : public std::integral_constant + : public sprout::integral_constant {}; template struct compressed_pair_switch - : public std::integral_constant + : public sprout::integral_constant {}; template struct compressed_pair_switch - : public std::integral_constant + : public sprout::integral_constant {}; template struct compressed_pair_switch - : public std::integral_constant + : public sprout::integral_constant {}; template struct compressed_pair_switch - : public std::integral_constant + : public sprout::integral_constant {}; template struct compressed_pair_switch - : public std::integral_constant + : public sprout::integral_constant {}; template diff --git a/sprout/container/container_traits.hpp b/sprout/container/container_traits.hpp index 0a0b0f7e..636e3bbd 100644 --- a/sprout/container/container_traits.hpp +++ b/sprout/container/container_traits.hpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -91,7 +92,7 @@ namespace sprout { // template struct has_container_nosy_iterator - : public std::integral_constant< + : public sprout::integral_constant< bool, sprout::detail::has_iterator::value || sprout::detail::has_const_iterator::value @@ -102,7 +103,7 @@ namespace sprout { // template struct has_container_nosy_value_type - : public std::integral_constant< + : public sprout::integral_constant< bool, sprout::detail::has_value_type::value || sprout::detail::has_container_nosy_iterator::value @@ -113,7 +114,7 @@ namespace sprout { // template struct has_container_nosy_static_size - : public std::integral_constant< + : public sprout::integral_constant< bool, sprout::detail::has_static_size::value || sprout::detail::is_array_like::value @@ -540,7 +541,7 @@ namespace sprout { Container, typename std::enable_if >::value>::type > - : public std::integral_constant< + : public sprout::integral_constant< typename sprout::container_traits::size_type, sprout::container_traits::static_size > @@ -550,7 +551,7 @@ namespace sprout { Container, typename std::enable_if >::value>::type > - : public std::integral_constant< + : public sprout::integral_constant< typename sprout::container_traits::size_type, 0 > diff --git a/sprout/container/detail/array_like.hpp b/sprout/container/detail/array_like.hpp index 62733ba8..8f67da5b 100644 --- a/sprout/container/detail/array_like.hpp +++ b/sprout/container/detail/array_like.hpp @@ -9,18 +9,18 @@ #define SPROUT_CONTAINER_DETAIL_ARRAY_LIKE_HPP #include -#include #include +#include namespace sprout { namespace detail { template struct is_array_like - : public std::false_type + : public sprout::false_type {}; template class Array, typename T, std::size_t N> struct is_array_like > - : public std::true_type + : public sprout::true_type {}; template struct is_array_like @@ -39,7 +39,7 @@ namespace sprout { struct array_like_static_size {}; template class Array, typename T, std::size_t N> struct array_like_static_size > - : public std::integral_constant + : public sprout::integral_constant {}; template struct array_like_static_size diff --git a/sprout/container/is_sub_container.hpp b/sprout/container/is_sub_container.hpp index 5900094e..968762f1 100644 --- a/sprout/container/is_sub_container.hpp +++ b/sprout/container/is_sub_container.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace sprout { namespace containers { @@ -19,7 +20,7 @@ namespace sprout { // template struct is_sub_container - : public std::integral_constant< + : public sprout::integral_constant< bool, !std::is_same::type, Container&&>::value > diff --git a/sprout/container/static_size.hpp b/sprout/container/static_size.hpp index 6d2c133f..470bc81f 100644 --- a/sprout/container/static_size.hpp +++ b/sprout/container/static_size.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_CONTAINER_STATIC_SIZE_HPP #define SPROUT_CONTAINER_STATIC_SIZE_HPP -#include #include #include +#include namespace sprout { namespace containers { @@ -19,7 +19,7 @@ namespace sprout { // template struct static_size - : public std::integral_constant< + : public sprout::integral_constant< typename sprout::container_traits::size_type, sprout::container_traits::static_size > diff --git a/sprout/container/weak_rebind_size.hpp b/sprout/container/weak_rebind_size.hpp index 35550b98..feaff4f8 100644 --- a/sprout/container/weak_rebind_size.hpp +++ b/sprout/container/weak_rebind_size.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace sprout { namespace containers { @@ -19,9 +20,9 @@ namespace sprout { typename T, template::size_type> class = T::template rebind_size > - std::true_type sprout_has_xxx_impl_check_template_rebind_size(int); + sprout::true_type sprout_has_xxx_impl_check_template_rebind_size(int); template - std::false_type sprout_has_xxx_impl_check_template_rebind_size(long); + sprout::false_type sprout_has_xxx_impl_check_template_rebind_size(long); #if defined(_MSC_VER) template(0))> struct has_rebind_size diff --git a/sprout/darkroom/access/traits.hpp b/sprout/darkroom/access/traits.hpp index 02f13fd6..9b03e68f 100644 --- a/sprout/darkroom/access/traits.hpp +++ b/sprout/darkroom/access/traits.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_DARKROOM_ACCESS_TRAITS_HPP #define SPROUT_DARKROOM_ACCESS_TRAITS_HPP -#include #include #include +#include namespace sprout { namespace darkroom { @@ -20,7 +20,7 @@ namespace sprout { // template struct is_tuple - : public std::false_type + : public sprout::false_type {}; template struct is_tuple @@ -36,7 +36,7 @@ namespace sprout { {}; template struct is_tuple > - : public std::true_type + : public sprout::true_type {}; } // namespace access } // namespace darkroom diff --git a/sprout/detail/digits_to_int.hpp b/sprout/detail/digits_to_int.hpp index e32e6085..15094be5 100644 --- a/sprout/detail/digits_to_int.hpp +++ b/sprout/detail/digits_to_int.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_DETAIL_DIGITS_TO_INT_HPP #define SPROUT_DETAIL_DIGITS_TO_INT_HPP -#include #include +#include namespace sprout { namespace detail { @@ -17,11 +17,11 @@ namespace sprout { struct digits_to_int; template struct digits_to_int - : public std::integral_constant + : public sprout::integral_constant {}; template struct digits_to_int - : public std::integral_constant::value> + : public sprout::integral_constant::value> {}; } // namespace detail } // namespace sprout diff --git a/sprout/detail/integer/static_log2.hpp b/sprout/detail/integer/static_log2.hpp index d8e4dda8..daf968cf 100644 --- a/sprout/detail/integer/static_log2.hpp +++ b/sprout/detail/integer/static_log2.hpp @@ -9,8 +9,8 @@ #define SPROUT_DETAIL_INTEGER_STATIC_LOG2_HPP #include -#include #include +#include namespace sprout { namespace detail { @@ -58,7 +58,7 @@ namespace sprout { template struct static_log2 - : public std::integral_constant< + : public sprout::integral_constant< sprout::detail::static_log2_result_type, sprout::detail::static_log2_impl::static_log2_impl::value > diff --git a/sprout/detail/sizeof.hpp b/sprout/detail/sizeof.hpp index 82dc72d9..4decf104 100644 --- a/sprout/detail/sizeof.hpp +++ b/sprout/detail/sizeof.hpp @@ -11,12 +11,18 @@ #include #include #include +#include namespace sprout { namespace detail { + template + struct sizeof_ + : public sprout::integral_constant + {}; + template struct sizeof_pack - : public std::integral_constant + : public sprout::integral_constant {}; } // namespace detail } // namespace sprout diff --git a/sprout/functional/bind/bind.hpp b/sprout/functional/bind/bind.hpp index a4dc77ac..f8bccd45 100644 --- a/sprout/functional/bind/bind.hpp +++ b/sprout/functional/bind/bind.hpp @@ -28,6 +28,7 @@ #include #include #include +#include namespace sprout { // 20.8.9 bind @@ -37,7 +38,7 @@ namespace sprout { // template struct is_bind_expression - : public std::false_type + : public sprout::false_type {}; template struct is_bind_expression @@ -201,7 +202,7 @@ namespace sprout { public: template struct apply - : public std::integral_constant< + : public sprout::integral_constant< bool, (sprout::is_variadic_placeholder::value > 0) > @@ -209,7 +210,7 @@ namespace sprout { }; template struct is_variadic_bounds - : public std::integral_constant< + : public sprout::integral_constant< bool, (sprout::types::find_index_if::value != sprout::tuples::tuple_size::value) > @@ -217,19 +218,19 @@ namespace sprout { template struct tail_place - : public std::integral_constant::value - 1> + : public sprout::integral_constant::value - 1> {}; template struct bound_size - : public std::integral_constant + : public sprout::integral_constant {}; template struct bound_size< T, ArgSize, typename std::enable_if<(sprout::is_variadic_placeholder::value > 0)>::type > - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, (ArgSize - sprout::detail::tail_place::value) > @@ -237,14 +238,14 @@ namespace sprout { template struct bounds_size_impl - : public std::integral_constant + : public sprout::integral_constant {}; template struct bounds_size_impl< I, Bounds, ArgSize, typename std::enable_if<(I < sprout::tuples::tuple_size::value)>::type > - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, (sprout::detail::bound_size::type, ArgSize>::value + sprout::detail::bounds_size_impl::value @@ -284,11 +285,11 @@ namespace sprout { template struct bound_position - : public std::integral_constant< + : public sprout::integral_constant< sprout::index_t, (sprout::types::lower_bound_index< typename sprout::detail::bounds_partial_size::type, - std::integral_constant + sprout::integral_constant >::type::value - 1 ) > @@ -296,7 +297,7 @@ namespace sprout { template struct is_variadic_part - : public std::integral_constant< + : public sprout::integral_constant< bool, (sprout::is_variadic_placeholder< typename sprout::tuples::tuple_element< @@ -798,19 +799,19 @@ namespace sprout { // template struct is_bind_expression > - : public std::true_type + : public sprout::true_type {}; template struct is_bind_expression > - : public std::true_type + : public sprout::true_type {}; template struct is_bind_expression > - : public std::true_type + : public sprout::true_type {}; template struct is_bind_expression > - : public std::true_type + : public sprout::true_type {}; namespace detail { diff --git a/sprout/functional/bind/placeholder.hpp b/sprout/functional/bind/placeholder.hpp index 921b59b0..59789761 100644 --- a/sprout/functional/bind/placeholder.hpp +++ b/sprout/functional/bind/placeholder.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_FUNCTIONAL_BIND_PLACEHOLDER_HPP #define SPROUT_FUNCTIONAL_BIND_PLACEHOLDER_HPP -#include #include +#include namespace sprout { // @@ -171,7 +171,7 @@ namespace sprout { // template struct is_placeholder - : public std::integral_constant + : public sprout::integral_constant {}; template struct is_placeholder @@ -187,7 +187,7 @@ namespace sprout { {}; template struct is_placeholder > - : public std::integral_constant + : public sprout::integral_constant {}; // @@ -195,7 +195,7 @@ namespace sprout { // template struct is_positional_placeholder - : public std::integral_constant + : public sprout::integral_constant {}; template struct is_positional_placeholder @@ -211,7 +211,7 @@ namespace sprout { {}; template<> struct is_positional_placeholder - : public std::integral_constant + : public sprout::integral_constant {}; // @@ -219,7 +219,7 @@ namespace sprout { // template struct is_variadic_placeholder - : public std::integral_constant + : public sprout::integral_constant {}; template struct is_variadic_placeholder @@ -235,7 +235,7 @@ namespace sprout { {}; template struct is_variadic_placeholder > - : public std::integral_constant + : public sprout::integral_constant {}; } // namespace sprout diff --git a/sprout/functional/hash/hash_value_traits.hpp b/sprout/functional/hash/hash_value_traits.hpp index e8d24de7..8b5b6570 100644 --- a/sprout/functional/hash/hash_value_traits.hpp +++ b/sprout/functional/hash/hash_value_traits.hpp @@ -15,12 +15,13 @@ #include #include #include +#include namespace sprout { namespace hash_detail { template struct is_basic_number - : public std::integral_constant< + : public sprout::integral_constant< bool, std::is_integral::value && (sizeof(T) <= sizeof(std::size_t)) @@ -28,7 +29,7 @@ namespace sprout { {}; template struct is_long_number - : public std::integral_constant< + : public sprout::integral_constant< bool, std::is_integral::value && (sizeof(T) > sizeof(std::size_t)) @@ -37,7 +38,7 @@ namespace sprout { {}; template struct is_ulong_number - : public std::integral_constant< + : public sprout::integral_constant< bool, std::is_integral::value && (sizeof(T) > sizeof(std::size_t)) diff --git a/sprout/functional/ref.hpp b/sprout/functional/ref.hpp index 5b73095c..82e4b121 100644 --- a/sprout/functional/ref.hpp +++ b/sprout/functional/ref.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -211,7 +212,7 @@ namespace sprout { // template struct is_reference_wrapper - : public std::false_type + : public sprout::false_type {}; template struct is_reference_wrapper @@ -227,7 +228,7 @@ namespace sprout { {}; template struct is_reference_wrapper > - : public std::true_type + : public sprout::true_type {}; // diff --git a/sprout/functional/type_traits/is_strict_function.hpp b/sprout/functional/type_traits/is_strict_function.hpp index ce0f9629..dad5c0c6 100644 --- a/sprout/functional/type_traits/is_strict_function.hpp +++ b/sprout/functional/type_traits/is_strict_function.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_FUNCTIONAL_TYPE_TRAITS_IS_STRICT_FUNCTION_HPP #define SPROUT_FUNCTIONAL_TYPE_TRAITS_IS_STRICT_FUNCTION_HPP -#include #include #include +#include namespace sprout { // @@ -18,7 +18,7 @@ namespace sprout { // template struct is_strict_unary_function - : public std::integral_constant< + : public sprout::integral_constant< bool, sprout::has_result_type::value && sprout::has_argument_type::value @@ -29,7 +29,7 @@ namespace sprout { // template struct is_strict_binary_function - : public std::integral_constant< + : public sprout::integral_constant< bool, sprout::has_result_type::value && sprout::has_first_argument_type::value diff --git a/sprout/generator/generator_access_traits.hpp b/sprout/generator/generator_access_traits.hpp index 0213db93..e3739dce 100644 --- a/sprout/generator/generator_access_traits.hpp +++ b/sprout/generator/generator_access_traits.hpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace sprout { namespace generators { @@ -23,8 +24,8 @@ namespace sprout { typename U = T, typename = decltype(std::declval().generated_value()) > - static std::true_type test(int); - static std::false_type test(...); + static sprout::true_type test(int); + static sprout::false_type test(...); }; #if defined(_MSC_VER) template::test(0))> @@ -98,8 +99,8 @@ namespace sprout { typename U = T, typename = decltype(std::declval().next_generator()) > - static std::true_type test(int); - static std::false_type test(...); + static sprout::true_type test(int); + static sprout::false_type test(...); }; #if defined(_MSC_VER) template::test(0))> diff --git a/sprout/index_tuple/integer_range.hpp b/sprout/index_tuple/integer_range.hpp index 244fac1d..4a3fe216 100644 --- a/sprout/index_tuple/integer_range.hpp +++ b/sprout/index_tuple/integer_range.hpp @@ -12,12 +12,13 @@ #include #include #include +#include namespace sprout { namespace detail { template struct integer_range_default_step - : public std::integral_constant::type, (First <= Last ? 1 : -1)> + : public sprout::integral_constant::type, (First <= Last ? 1 : -1)> {}; } // namespace detail diff --git a/sprout/index_tuple/tuple.hpp b/sprout/index_tuple/tuple.hpp index b8129de8..f7dd15e0 100644 --- a/sprout/index_tuple/tuple.hpp +++ b/sprout/index_tuple/tuple.hpp @@ -10,11 +10,11 @@ #include #include -#include #include #include #include #include +#include namespace std { #if defined(__clang__) @@ -26,7 +26,7 @@ namespace std { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; // // tuple_element diff --git a/sprout/integer/integer_digits.hpp b/sprout/integer/integer_digits.hpp index a2315b0f..1df59a26 100644 --- a/sprout/integer/integer_digits.hpp +++ b/sprout/integer/integer_digits.hpp @@ -12,12 +12,13 @@ #include #include #include +#include namespace sprout { namespace detail { template struct integer_digits_impl - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, (CHAR_BIT * sizeof(IntType) - (std::is_signed::value ? 1 : 0)) * N / D + ((CHAR_BIT * sizeof(IntType) - (std::is_signed::value ? 1 : 0)) * N % D ? 1 : 0) diff --git a/sprout/integer/static_pow.hpp b/sprout/integer/static_pow.hpp index e92f737c..2e18bcf7 100644 --- a/sprout/integer/static_pow.hpp +++ b/sprout/integer/static_pow.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_INTEGER_STATIC_POW_HPP #define SPROUT_INTEGER_STATIC_POW_HPP -#include #include +#include namespace sprout { // @@ -17,7 +17,7 @@ namespace sprout { // template struct static_pow2 - : public std::integral_constant + : public sprout::integral_constant {}; namespace detail { @@ -25,11 +25,11 @@ namespace sprout { struct static_pow2m1; template struct static_pow2m1 - : public std::integral_constant + : public sprout::integral_constant {}; template struct static_pow2m1 - : public std::integral_constant + : public sprout::integral_constant {}; } // namespace detail // @@ -45,15 +45,15 @@ namespace sprout { struct static_pow; template struct static_pow - : public std::integral_constant + : public sprout::integral_constant {}; template struct static_pow - : public std::integral_constant + : public sprout::integral_constant {}; template struct static_pow - : public std::integral_constant + : public sprout::integral_constant {}; template struct static_pow @@ -61,7 +61,7 @@ namespace sprout { {}; template struct static_pow - : public std::integral_constant::value> + : public sprout::integral_constant::value> {}; } // namespace detail // diff --git a/sprout/io.hpp b/sprout/io.hpp index 45a3cb81..843fb694 100644 --- a/sprout/io.hpp +++ b/sprout/io.hpp @@ -13,16 +13,17 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include #include -#include #include HDR_ALGORITHM_MIN_MAX_SSCRISK_CEL_OR_SPROUT namespace sprout { @@ -61,7 +62,7 @@ namespace sprout { // template struct boolean_flag - : public std::integral_constant + : public sprout::integral_constant { private: bool flag_; @@ -86,7 +87,7 @@ namespace sprout { // template struct field_flag - : public std::integral_constant + : public sprout::integral_constant { public: SPROUT_STATIC_CONSTEXPR sprout::io::flags::fmtflags mask = Mask; @@ -565,15 +566,15 @@ namespace sprout { struct leaf_count; template<> struct leaf_count - : public std::integral_constant + : public sprout::integral_constant {}; template struct leaf_count > - : public std::integral_constant + : public sprout::integral_constant {}; template struct leaf_count > - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, sprout::io::detail::leaf_count::value + sprout::io::detail::leaf_count::value > diff --git a/sprout/iterator/index_iterator.hpp b/sprout/iterator/index_iterator.hpp index edf56131..08c2552d 100644 --- a/sprout/iterator/index_iterator.hpp +++ b/sprout/iterator/index_iterator.hpp @@ -19,6 +19,7 @@ #include #include #include +#include namespace sprout { // @@ -250,7 +251,7 @@ namespace sprout { // template struct is_index_iterator - : public std::false_type + : public sprout::false_type {}; template struct is_index_iterator @@ -262,7 +263,7 @@ namespace sprout { {}; template struct is_index_iterator > - : public std::true_type + : public sprout::true_type {}; // diff --git a/sprout/iterator/ptr_index_iterator.hpp b/sprout/iterator/ptr_index_iterator.hpp index 3944d62a..31395d48 100644 --- a/sprout/iterator/ptr_index_iterator.hpp +++ b/sprout/iterator/ptr_index_iterator.hpp @@ -17,6 +17,7 @@ #include #include #include +#include namespace sprout { // @@ -273,7 +274,7 @@ namespace sprout { // template struct is_ptr_index_iterator - : public std::false_type + : public sprout::false_type {}; template struct is_ptr_index_iterator @@ -285,7 +286,7 @@ namespace sprout { {}; template struct is_ptr_index_iterator > - : public std::true_type + : public sprout::true_type {}; // diff --git a/sprout/iterator/type_traits/common.hpp b/sprout/iterator/type_traits/common.hpp index 51ba3288..86abfdf3 100644 --- a/sprout/iterator/type_traits/common.hpp +++ b/sprout/iterator/type_traits/common.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -21,19 +22,19 @@ namespace sprout { struct iterator_category_hierarchy_impl; template struct iterator_category_hierarchy_impl - : public std::integral_constant + : public sprout::integral_constant {}; template struct iterator_category_hierarchy_impl - : public std::integral_constant + : public sprout::integral_constant {}; template struct iterator_category_hierarchy_impl - : public std::integral_constant + : public sprout::integral_constant {}; template struct iterator_category_hierarchy_impl - : public std::integral_constant + : public sprout::integral_constant {}; template @@ -49,7 +50,7 @@ namespace sprout { template struct iterator_category_less - : public std::integral_constant< + : public sprout::integral_constant< bool, (sprout::detail::iterator_category_hierarchy::value < sprout::detail::iterator_category_hierarchy::value) > diff --git a/sprout/iterator/type_traits/is_constant_distance_iterator.hpp b/sprout/iterator/type_traits/is_constant_distance_iterator.hpp index 5ef6685d..c07467d8 100644 --- a/sprout/iterator/type_traits/is_constant_distance_iterator.hpp +++ b/sprout/iterator/type_traits/is_constant_distance_iterator.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace sprout { // @@ -18,7 +19,7 @@ namespace sprout { // template struct is_constant_distance_iterator - : public std::integral_constant< + : public sprout::integral_constant< bool, #ifdef SPROUT_NO_CXX14_CONSTEXPR sprout::is_random_access_iterator::value && !std::is_pointer::value diff --git a/sprout/iterator/type_traits/is_iterator_category_of.hpp b/sprout/iterator/type_traits/is_iterator_category_of.hpp index 7e253023..99c4c066 100644 --- a/sprout/iterator/type_traits/is_iterator_category_of.hpp +++ b/sprout/iterator/type_traits/is_iterator_category_of.hpp @@ -9,8 +9,8 @@ #define SPROUT_ITERATOR_TYPE_TRAITS_IS_ITERATOR_CATEGORY_OF_HPP #include -#include #include +#include namespace sprout { // @@ -18,7 +18,7 @@ namespace sprout { // template struct is_iterator_category_of - : public std::is_convertible + : public sprout::is_convertible {}; // diff --git a/sprout/iterator/type_traits/is_iterator_of.hpp b/sprout/iterator/type_traits/is_iterator_of.hpp index 8e783b7f..c091f86f 100644 --- a/sprout/iterator/type_traits/is_iterator_of.hpp +++ b/sprout/iterator/type_traits/is_iterator_of.hpp @@ -13,12 +13,13 @@ #include #include #include +#include namespace sprout { namespace detail { template struct is_iterator_of_impl - : public std::false_type + : public sprout::false_type {}; template struct is_iterator_of_impl< @@ -78,7 +79,7 @@ namespace sprout { // template struct is_iterator_outputable - : public std::integral_constant< + : public sprout::integral_constant< bool, sprout::is_output_iterator::type>::value || sprout::is_forward_iterator::type>::value diff --git a/sprout/pit/type_traits.hpp b/sprout/pit/type_traits.hpp index fce3a4a5..67bc1f07 100644 --- a/sprout/pit/type_traits.hpp +++ b/sprout/pit/type_traits.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_PIT_TYPE_TRAITS_HPP #define SPROUT_PIT_TYPE_TRAITS_HPP -#include #include #include +#include namespace sprout { // @@ -18,7 +18,7 @@ namespace sprout { // template struct is_pit - : public std::false_type + : public sprout::false_type {}; template struct is_pit @@ -30,7 +30,7 @@ namespace sprout { {}; template struct is_pit > - : public std::true_type + : public sprout::true_type {}; } // namespace sprout diff --git a/sprout/random/detail/seed_impl.hpp b/sprout/random/detail/seed_impl.hpp index 9fee0f53..3360f13b 100644 --- a/sprout/random/detail/seed_impl.hpp +++ b/sprout/random/detail/seed_impl.hpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -26,13 +27,13 @@ namespace sprout { struct seed_log : public std::conditional< m == 0, - std::integral_constant::digits>, - std::integral_constant::value> + sprout::integral_constant::digits>, + sprout::integral_constant::value> >::type {}; template struct seed_k - : public std::integral_constant< + : public sprout::integral_constant< int, (log + ((~(IntType(2) << (log - 1)) & m)? 32 : 31)) / 32 > diff --git a/sprout/random/random_result.hpp b/sprout/random/random_result.hpp index d554fb7e..33310d6b 100644 --- a/sprout/random/random_result.hpp +++ b/sprout/random/random_result.hpp @@ -18,6 +18,7 @@ #include #include #include +#include namespace sprout { namespace random { @@ -365,7 +366,7 @@ namespace std { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/range/adaptor/sized.hpp b/sprout/range/adaptor/sized.hpp index 49152848..db2b1b9d 100644 --- a/sprout/range/adaptor/sized.hpp +++ b/sprout/range/adaptor/sized.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -49,7 +50,7 @@ namespace sprout { // template class size_holder - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/range/range_container.hpp b/sprout/range/range_container.hpp index b4de299b..ac985575 100644 --- a/sprout/range/range_container.hpp +++ b/sprout/range/range_container.hpp @@ -17,6 +17,7 @@ #include #include #include +#include namespace sprout { namespace range { @@ -117,7 +118,7 @@ namespace sprout { // template struct is_range_container - : public std::false_type + : public sprout::false_type {}; template struct is_range_container @@ -133,7 +134,7 @@ namespace sprout { {}; template struct is_range_container > - : public std::true_type + : public sprout::true_type {}; // diff --git a/sprout/string/float_to_string.hpp b/sprout/string/float_to_string.hpp index c62d944e..c8198fff 100644 --- a/sprout/string/float_to_string.hpp +++ b/sprout/string/float_to_string.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -34,7 +35,7 @@ namespace sprout { // template struct printed_float_digits - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, sprout::numeric_limits::max_exponent10 + sprout::detail::decimal_places_length + 2 > @@ -104,7 +105,7 @@ namespace sprout { namespace detail { template struct printed_float_exponent10_digits - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, NS_SSCRISK_CEL_OR_SPROUT::max(sprout::detail::int_digits(sprout::numeric_limits::max_exponent10), 2) > @@ -116,7 +117,7 @@ namespace sprout { // template struct printed_float_exp_digits - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, 5 + sprout::detail::decimal_places_length + sprout::detail::printed_float_exponent10_digits::value > diff --git a/sprout/string/int_to_string.hpp b/sprout/string/int_to_string.hpp index a9c2d3e2..47dc295e 100644 --- a/sprout/string/int_to_string.hpp +++ b/sprout/string/int_to_string.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,7 @@ namespace sprout { // template struct printed_integer_digits - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, sprout::integer_digits::value + (std::is_signed::value ? 1 : 0) > diff --git a/sprout/string/npos.hpp b/sprout/string/npos.hpp index 26cde0d3..cd07b2d9 100644 --- a/sprout/string/npos.hpp +++ b/sprout/string/npos.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_STRING_NPOS_HPP #define SPROUT_STRING_NPOS_HPP -#include #include +#include #include #include @@ -22,7 +22,7 @@ namespace sprout { public: template::value>::type = sprout::enabler> struct get - : public std::integral_constant + : public sprout::integral_constant {}; public: template::value>::type = sprout::enabler> diff --git a/sprout/string/string.hpp b/sprout/string/string.hpp index a2709a2e..b1f301b9 100644 --- a/sprout/string/string.hpp +++ b/sprout/string/string.hpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -234,7 +235,7 @@ namespace sprout { #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION template class is_string_iterator - : public std::false_type + : public sprout::false_type {}; template class is_string_iterator @@ -250,11 +251,11 @@ namespace sprout { {}; template class is_string_iterator&, true> > - : public std::true_type + : public sprout::true_type {}; template class is_string_iterator const&, true> > - : public std::true_type + : public sprout::true_type {}; #endif public: diff --git a/sprout/string/tuple.hpp b/sprout/string/tuple.hpp index 3d8f0042..a4273864 100644 --- a/sprout/string/tuple.hpp +++ b/sprout/string/tuple.hpp @@ -10,11 +10,11 @@ #include #include -#include #include #include #include #include +#include namespace sprout { // @@ -49,7 +49,7 @@ namespace std { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/string/type_traits.hpp b/sprout/string/type_traits.hpp index 7d275a05..68097ec7 100644 --- a/sprout/string/type_traits.hpp +++ b/sprout/string/type_traits.hpp @@ -9,9 +9,9 @@ #define SPROUT_STRING_TYPE_TRAITS_HPP #include -#include #include #include +#include namespace sprout { // @@ -52,7 +52,7 @@ namespace sprout { // template struct is_basic_string - : public std::false_type + : public sprout::false_type {}; template struct is_basic_string @@ -64,7 +64,7 @@ namespace sprout { {}; template struct is_basic_string > - : public std::true_type + : public sprout::true_type {}; // @@ -72,7 +72,7 @@ namespace sprout { // template struct is_string_of - : public std::false_type + : public sprout::false_type {}; template struct is_string_of @@ -84,7 +84,7 @@ namespace sprout { {}; template struct is_string_of, Elem> - : public std::true_type + : public sprout::true_type {}; // diff --git a/sprout/sub_array/type_traits.hpp b/sprout/sub_array/type_traits.hpp index 38b3014d..5036fa78 100644 --- a/sprout/sub_array/type_traits.hpp +++ b/sprout/sub_array/type_traits.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_SUB_ARRAY_TYPE_TRAITS_HPP #define SPROUT_SUB_ARRAY_TYPE_TRAITS_HPP -#include #include #include +#include namespace sprout { // @@ -18,7 +18,7 @@ namespace sprout { // template struct is_sub_array - : public std::false_type + : public sprout::false_type {}; template struct is_sub_array @@ -30,7 +30,7 @@ namespace sprout { {}; template struct is_sub_array > - : public std::true_type + : public sprout::true_type {}; } // namespace sprout diff --git a/sprout/tuple/sscrisk/cel/utility.hpp b/sprout/tuple/sscrisk/cel/utility.hpp index 5fcda9fe..69dc621a 100644 --- a/sprout/tuple/sscrisk/cel/utility.hpp +++ b/sprout/tuple/sscrisk/cel/utility.hpp @@ -9,11 +9,11 @@ #define SPROUT_TUPLE_SSCRISK_CEL_UTILITY_HPP #include -#include #include #include #include #include +#include namespace sprout { namespace tuples { @@ -22,7 +22,7 @@ namespace sprout { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; namespace detail { diff --git a/sprout/tuple/tuple/tuple_decl.hpp b/sprout/tuple/tuple/tuple_decl.hpp index e45b9b49..ca5e1ba1 100644 --- a/sprout/tuple/tuple/tuple_decl.hpp +++ b/sprout/tuple/tuple/tuple_decl.hpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -290,7 +291,7 @@ namespace sprout { template struct is_fixedly_convert_constructible - : public std::integral_constant< + : public sprout::integral_constant< bool, (sizeof...(UTypes) == sizeof...(Types) && is_flexibly_convert_constructible::value) > @@ -495,7 +496,7 @@ namespace std { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/tuple/tuple/type_traits.hpp b/sprout/tuple/tuple/type_traits.hpp index 3237d17e..1d768ff8 100644 --- a/sprout/tuple/tuple/type_traits.hpp +++ b/sprout/tuple/tuple/type_traits.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_TUPLE_TUPLE_TYPE_TRAITS_HPP #define SPROUT_TUPLE_TUPLE_TYPE_TRAITS_HPP -#include #include #include +#include namespace sprout { namespace tuples { @@ -19,7 +19,7 @@ namespace sprout { // template struct is_tuple - : public std::false_type + : public sprout::false_type {}; template struct is_tuple @@ -31,7 +31,7 @@ namespace sprout { {}; template struct is_tuple > - : public std::true_type + : public sprout::true_type {}; } // namespace tuples diff --git a/sprout/type/algorithm/find_index.hpp b/sprout/type/algorithm/find_index.hpp index 4099bcde..e69c61fd 100644 --- a/sprout/type/algorithm/find_index.hpp +++ b/sprout/type/algorithm/find_index.hpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace sprout { namespace types { @@ -26,7 +27,7 @@ namespace sprout { || std::is_same::type, T>::value >::type > - : public std::integral_constant + : public sprout::integral_constant {}; template struct find_index_impl< diff --git a/sprout/type/algorithm/find_index_if.hpp b/sprout/type/algorithm/find_index_if.hpp index 6e9c04bd..056891fa 100644 --- a/sprout/type/algorithm/find_index_if.hpp +++ b/sprout/type/algorithm/find_index_if.hpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace sprout { namespace types { @@ -26,7 +27,7 @@ namespace sprout { || Predicate::template apply::type>::type::value >::type > - : public std::integral_constant + : public sprout::integral_constant {}; template struct find_index_if_impl< diff --git a/sprout/type/algorithm/lower_bound_index.hpp b/sprout/type/algorithm/lower_bound_index.hpp index fae44a44..1eea81ef 100644 --- a/sprout/type/algorithm/lower_bound_index.hpp +++ b/sprout/type/algorithm/lower_bound_index.hpp @@ -13,6 +13,7 @@ #include #include #include +#include namespace sprout { namespace types { @@ -29,7 +30,7 @@ namespace sprout { Tuple, T, Compare, First, Last, 0 > - : public std::integral_constant + : public sprout::integral_constant {}; template< typename Tuple, typename T, typename Compare, std::size_t First, std::size_t Last @@ -38,7 +39,7 @@ namespace sprout { Tuple, T, Compare, First, Last, 1 > - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, Compare::template apply::type, T>::type::value ? Last : First > diff --git a/sprout/type/algorithm/upper_bound_index.hpp b/sprout/type/algorithm/upper_bound_index.hpp index bb44f23f..55edfa1b 100644 --- a/sprout/type/algorithm/upper_bound_index.hpp +++ b/sprout/type/algorithm/upper_bound_index.hpp @@ -13,6 +13,7 @@ #include #include #include +#include namespace sprout { namespace types { @@ -29,7 +30,7 @@ namespace sprout { Tuple, T, Compare, First, Last, 0 > - : public std::integral_constant + : public sprout::integral_constant {}; template< typename Tuple, typename T, typename Compare, std::size_t First, std::size_t Last @@ -38,7 +39,7 @@ namespace sprout { Tuple, T, Compare, First, Last, 1 > - : public std::integral_constant< + : public sprout::integral_constant< std::size_t, !Compare::template apply::type>::type::value ? Last : First > diff --git a/sprout/type/functional/less.hpp b/sprout/type/functional/less.hpp index 517cf310..b8459f7d 100644 --- a/sprout/type/functional/less.hpp +++ b/sprout/type/functional/less.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_FUNCTIONAL_LESS_HPP #define SPROUT_TYPE_FUNCTIONAL_LESS_HPP -#include #include +#include namespace sprout { namespace types { @@ -18,7 +18,7 @@ namespace sprout { // template struct less - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/type/integral_array.hpp b/sprout/type/integral_array.hpp index 837515af..55bc10c6 100644 --- a/sprout/type/integral_array.hpp +++ b/sprout/type/integral_array.hpp @@ -10,11 +10,11 @@ #include #include -#include #include #include #include #include +#include namespace sprout { namespace types { @@ -23,7 +23,7 @@ namespace sprout { // template struct integral_array - : public sprout::types::type_tuple...> + : public sprout::types::type_tuple...> { public: typedef integral_array type; @@ -42,7 +42,7 @@ namespace std { // template struct tuple_size > - : public std::tuple_size...> > + : public std::tuple_size...> > {}; // @@ -50,7 +50,7 @@ namespace std { // template struct tuple_element > - : public std::tuple_element...> > + : public std::tuple_element...> > {}; #if defined(__clang__) # pragma clang diagnostic pop diff --git a/sprout/type/iterator/distance.hpp b/sprout/type/iterator/distance.hpp index 879e9d80..fde3c807 100644 --- a/sprout/type/iterator/distance.hpp +++ b/sprout/type/iterator/distance.hpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace sprout { namespace types { @@ -30,7 +31,7 @@ namespace sprout { std::is_same::value >::type > - : public std::integral_constant + : public sprout::integral_constant {}; template struct distance_impl< diff --git a/sprout/type/iterator/index_iterator.hpp b/sprout/type/iterator/index_iterator.hpp index 49665933..fc969651 100644 --- a/sprout/type/iterator/index_iterator.hpp +++ b/sprout/type/iterator/index_iterator.hpp @@ -21,7 +21,7 @@ namespace sprout { // template struct index_iterator - : public std::integral_constant + : public sprout::integral_constant { public: typedef typename sprout::types::tuple_element::type type; diff --git a/sprout/type/string/to_string_constant.hpp b/sprout/type/string/to_string_constant.hpp index d8694843..ce0b3ae5 100644 --- a/sprout/type/string/to_string_constant.hpp +++ b/sprout/type/string/to_string_constant.hpp @@ -16,6 +16,7 @@ #include #include #include +#include namespace sprout { namespace types { @@ -27,11 +28,11 @@ namespace sprout { public: template struct apply - : public std::false_type + : public sprout::false_type {}; template struct apply::type> - : public std::true_type + : public sprout::true_type {}; }; template diff --git a/sprout/type/type_tuple.hpp b/sprout/type/type_tuple.hpp index fa6a9ee7..eda80fb2 100644 --- a/sprout/type/type_tuple.hpp +++ b/sprout/type/type_tuple.hpp @@ -10,12 +10,12 @@ #include #include -#include #include #include #include #include #include +#include namespace sprout { namespace types { @@ -76,7 +76,7 @@ namespace std { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/type_traits/arithmetic_promote.hpp b/sprout/type_traits/arithmetic_promote.hpp index 38f96da9..eb733575 100644 --- a/sprout/type_traits/arithmetic_promote.hpp +++ b/sprout/type_traits/arithmetic_promote.hpp @@ -9,8 +9,8 @@ #define SPROUT_TYPE_TRAITS_ARITHMETIC_PROMOTE_HPP #include +#include #include -#include #include namespace sprout { @@ -20,17 +20,17 @@ namespace sprout { : public sprout::identity { static_assert( - sprout::is_arithmetic::value, + std::is_arithmetic::value, "arithmetic_promote requires arithmetic types." ); }; template struct arithmetic_promote2 - : public sprout::decay() + std::declval())> + : public std::decay() + std::declval())> { static_assert( - sprout::is_arithmetic::value && sprout::is_arithmetic::value, + std::is_arithmetic::value && std::is_arithmetic::value, "arithmetic_promote requires arithmetic types." ); }; @@ -56,7 +56,7 @@ namespace sprout { template struct arithmetic_promote : public sprout::detail::arithmetic_promote_impl< - typename sprout::remove_cv::type... + typename std::remove_cv::type... > {}; diff --git a/sprout/type_traits/enabler_if.hpp b/sprout/type_traits/enabler_if.hpp index 304c3554..874c3412 100644 --- a/sprout/type_traits/enabler_if.hpp +++ b/sprout/type_traits/enabler_if.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_ENABLER_IF_HPP #define SPROUT_TYPE_TRAITS_ENABLER_IF_HPP +#include #include -#include namespace sprout { // @@ -23,7 +23,7 @@ namespace sprout { // template class enabler_if - : public sprout::enable_if + : public std::enable_if {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/float_promote.hpp b/sprout/type_traits/float_promote.hpp index dc494e62..5df4f421 100644 --- a/sprout/type_traits/float_promote.hpp +++ b/sprout/type_traits/float_promote.hpp @@ -8,40 +8,40 @@ #ifndef SPROUT_TYPE_TRAITS_FLOAT_PROMOTE_HPP #define SPROUT_TYPE_TRAITS_FLOAT_PROMOTE_HPP +#include #include -#include #include namespace sprout { namespace detail { template struct float_promote1 - : public sprout::conditional< - sprout::is_floating_point::value, + : public std::conditional< + std::is_floating_point::value, T, double > { static_assert( - sprout::is_arithmetic::value, + std::is_arithmetic::value, "float_promote requires arithmetic type." ); }; template struct float_promote2 - : public sprout::conditional< - (sprout::is_same::value || sprout::is_same::value), + : public std::conditional< + (std::is_same::value || std::is_same::value), long double, - typename sprout::conditional< - (sprout::is_same::value && sprout::is_same::value), + typename std::conditional< + (std::is_same::value && std::is_same::value), float, double >::type > { static_assert( - sprout::is_arithmetic::value && sprout::is_arithmetic::value, + std::is_arithmetic::value && std::is_arithmetic::value, "float_promote requires arithmetic type." ); }; @@ -67,7 +67,7 @@ namespace sprout { template struct float_promote : public sprout::detail::float_promote_impl< - typename sprout::remove_cv::type... + typename std::remove_cv::type... > {}; diff --git a/sprout/type_traits/has_xxx.hpp b/sprout/type_traits/has_xxx.hpp index 87f90e11..07ed72ea 100644 --- a/sprout/type_traits/has_xxx.hpp +++ b/sprout/type_traits/has_xxx.hpp @@ -11,7 +11,6 @@ #include #include #include -#include // // SPROUT_HAS_XXX_TYPE_DEF diff --git a/sprout/type_traits/inherit_if_xxx.hpp b/sprout/type_traits/inherit_if_xxx.hpp index fe532962..ba83e588 100644 --- a/sprout/type_traits/inherit_if_xxx.hpp +++ b/sprout/type_traits/inherit_if_xxx.hpp @@ -11,9 +11,9 @@ #if defined(_MSC_VER) # include #endif +#include #include #include -#include #include // @@ -27,7 +27,7 @@ template \ struct NAME< \ T, \ - typename sprout::enable_if::value>::type \ + typename std::enable_if::value>::type \ > { \ public: \ typedef typename T::TYPE ALIAS; \ @@ -56,7 +56,7 @@ template \ struct NAME< \ T, \ - typename sprout::enable_if::value>::type \ + typename std::enable_if::value>::type \ > { \ public: \ SPROUT_STATIC_CONSTEXPR std::size_t ALIAS = T::CONSTANT; \ @@ -64,7 +64,7 @@ template \ SPROUT_CONSTEXPR_OR_CONST std::size_t NAME< \ T, \ - typename sprout::enable_if::value>::type \ + typename std::enable_if::value>::type \ >::ALIAS #else #define SPROUT_INHERIT_ALIAS_IF_XXX_CONSTANT_DEF(NAME, ALIAS, CONSTANT) \ @@ -74,15 +74,15 @@ template \ struct NAME< \ T, \ - typename sprout::enable_if::value>::type \ + typename std::enable_if::value>::type \ > { \ public: \ - SPROUT_STATIC_CONSTEXPR typename sprout::decay::type ALIAS = T::CONSTANT; \ + SPROUT_STATIC_CONSTEXPR typename std::decay::type ALIAS = T::CONSTANT; \ }; \ template \ - SPROUT_CONSTEXPR_OR_CONST typename sprout::decay::type NAME< \ + SPROUT_CONSTEXPR_OR_CONST typename std::decay::type NAME< \ T, \ - typename sprout::enable_if::value>::type \ + typename std::enable_if::value>::type \ >::ALIAS #endif #define SPROUT_INHERIT_ALIAS_IF_XXX_CONSTANT_DEF_LAZY(ALIAS, CONSTANT) \ diff --git a/sprout/type_traits/is_c_str.hpp b/sprout/type_traits/is_c_str.hpp index a898ca4b..44fed3d3 100644 --- a/sprout/type_traits/is_c_str.hpp +++ b/sprout/type_traits/is_c_str.hpp @@ -34,7 +34,7 @@ namespace sprout { {}; template struct is_c_str - : public std::true_type + : public sprout::true_type {}; template struct is_c_str diff --git a/sprout/type_traits/is_int.hpp b/sprout/type_traits/is_int.hpp index c1138b5b..76905856 100644 --- a/sprout/type_traits/is_int.hpp +++ b/sprout/type_traits/is_int.hpp @@ -1,4 +1,3 @@ -#include /*============================================================================= Copyright (c) 2011-2013 Bolero MURAKAMI https://github.com/bolero-MURAKAMI/Sprout @@ -9,9 +8,9 @@ #ifndef SPROUT_TYPE_TRAITS_IS_INT_HPP #define SPROUT_TYPE_TRAITS_IS_INT_HPP +#include #include #include -#include namespace sprout { // @@ -21,7 +20,7 @@ namespace sprout { struct is_int : public sprout::integral_constant< bool, - sprout::is_integral::value && sprout::is_signed::value + std::is_integral::value && std::is_signed::value > {}; diff --git a/sprout/type_traits/is_uint.hpp b/sprout/type_traits/is_uint.hpp index 8ff75793..bc82287e 100644 --- a/sprout/type_traits/is_uint.hpp +++ b/sprout/type_traits/is_uint.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_TYPE_TRAITS_IS_UINT_HPP #define SPROUT_TYPE_TRAITS_IS_UINT_HPP +#include #include #include -#include namespace sprout { // @@ -20,7 +20,7 @@ namespace sprout { struct is_uint : public sprout::integral_constant< bool, - sprout::is_integral::value && sprout::is_unsigned::value + std::is_integral::value && std::is_unsigned::value > {}; diff --git a/sprout/type_traits/remove_cvref.hpp b/sprout/type_traits/remove_cvref.hpp index 80273c8f..f9c97765 100644 --- a/sprout/type_traits/remove_cvref.hpp +++ b/sprout/type_traits/remove_cvref.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_CVREF_HPP #define SPROUT_TYPE_TRAITS_REMOVE_CVREF_HPP +#include #include -#include namespace sprout { // @@ -17,8 +17,8 @@ namespace sprout { // template struct remove_cvref - : public sprout::remove_cv< - typename sprout::remove_reference::type + : public std::remove_cv< + typename std::remove_reference::type > {}; diff --git a/sprout/type_traits/remove_shallow_const.hpp b/sprout/type_traits/remove_shallow_const.hpp index 83856ebd..0b6ef7f1 100644 --- a/sprout/type_traits/remove_shallow_const.hpp +++ b/sprout/type_traits/remove_shallow_const.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CONST_HPP #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CONST_HPP +#include #include -#include #include namespace sprout { @@ -22,7 +22,7 @@ namespace sprout { {}; template struct remove_shallow_const - : public sprout::conditional::value, T const, T> + : public std::conditional::value, T const, T> {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/remove_shallow_cv.hpp b/sprout/type_traits/remove_shallow_cv.hpp index 0142242a..e7350b83 100644 --- a/sprout/type_traits/remove_shallow_cv.hpp +++ b/sprout/type_traits/remove_shallow_cv.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CV_HPP #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CV_HPP +#include #include -#include #include namespace sprout { @@ -22,15 +22,15 @@ namespace sprout { {}; template struct remove_shallow_cv - : public sprout::conditional::value, T const, T> + : public std::conditional::value, T const, T> {}; template struct remove_shallow_cv - : public sprout::conditional::value, T volatile, T> + : public std::conditional::value, T volatile, T> {}; template struct remove_shallow_cv - : public sprout::conditional::value, T const volatile, T> + : public std::conditional::value, T const volatile, T> {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/remove_shallow_volatile.hpp b/sprout/type_traits/remove_shallow_volatile.hpp index e732872a..d216ce0d 100644 --- a/sprout/type_traits/remove_shallow_volatile.hpp +++ b/sprout/type_traits/remove_shallow_volatile.hpp @@ -8,8 +8,8 @@ #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_VOLATILE_HPP #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_VOLATILE_HPP +#include #include -#include #include namespace sprout { @@ -22,7 +22,7 @@ namespace sprout { {}; template struct remove_shallow_volatile - : public sprout::conditional::value, T volatile, T> + : public std::conditional::value, T volatile, T> {}; #if SPROUT_USE_TEMPLATE_ALIASES diff --git a/sprout/type_traits/std_type_traits.hpp b/sprout/type_traits/std_type_traits.hpp index 748452ff..470452a9 100644 --- a/sprout/type_traits/std_type_traits.hpp +++ b/sprout/type_traits/std_type_traits.hpp @@ -335,8 +335,8 @@ namespace sprout { struct is_trivially_destructible : public sprout::integral_constant< bool, - sprout::is_scalar::type>::value - || sprout::is_reference::type>::value + std::is_scalar::type>::value + || std::is_reference::type>::value > {}; #endif // #if SPROUT_CLANG_HAS_FUTURE(has_trivial_destructor) || SPROUT_GCC_GREATER_EQUAL(4, 3, 0) @@ -379,8 +379,8 @@ namespace sprout { struct is_nothrow_destructible : public sprout::integral_constant< bool, - sprout::is_scalar::type>::value - || sprout::is_reference::type>::value + std::is_scalar::type>::value + || std::is_reference::type>::value > {}; #else // #if !defined(_LIBCPP_VERSION) && SPROUT_GCC_LESS(4, 8, 0) @@ -460,9 +460,9 @@ namespace sprout { #if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION < 1101) template struct aligned_union - : public sprout::aligned_storage< + : public std::aligned_storage< sprout::tpp::max_element_c::value, - sprout::tpp::max_element_c::value...>::value + sprout::tpp::max_element_c::value...>::value > {}; #else // #if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION < 1101) diff --git a/sprout/utility/pack.hpp b/sprout/utility/pack.hpp index b55d8ea6..44b0e390 100644 --- a/sprout/utility/pack.hpp +++ b/sprout/utility/pack.hpp @@ -9,9 +9,9 @@ #define SPROUT_UTILITY_PACK_HPP #include -#include #include #include +#include #include namespace sprout { @@ -45,7 +45,7 @@ namespace sprout { // template struct tppack_c_at - : public sprout::tppack_at...>::type + : public sprout::tppack_at...>::type {}; // diff --git a/sprout/utility/pair/tuple.hpp b/sprout/utility/pair/tuple.hpp index e1c72863..bf04209e 100644 --- a/sprout/utility/pair/tuple.hpp +++ b/sprout/utility/pair/tuple.hpp @@ -9,10 +9,10 @@ #define SPROUT_UTILITY_PAIR_TUPLE_HPP #include -#include #include #include #include +#include namespace sprout { namespace tuples { @@ -66,7 +66,7 @@ namespace std { // template struct tuple_size > - : public std::integral_constant + : public sprout::integral_constant {}; // diff --git a/sprout/utility/string_ref/string_ref.hpp b/sprout/utility/string_ref/string_ref.hpp index 8256290d..2f1c6e18 100644 --- a/sprout/utility/string_ref/string_ref.hpp +++ b/sprout/utility/string_ref/string_ref.hpp @@ -20,6 +20,7 @@ #include #include #include +#include #include HDR_ALGORITHM_MIN_MAX_SSCRISK_CEL_OR_SPROUT #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION # include @@ -53,7 +54,7 @@ namespace sprout { private: template class is_string_ref_iterator - : public std::integral_constant< + : public sprout::integral_constant< bool, std::is_same >::value || std::is_same >::value diff --git a/sprout/utility/string_ref/type_traits.hpp b/sprout/utility/string_ref/type_traits.hpp index de4cadf4..5dd22a9e 100644 --- a/sprout/utility/string_ref/type_traits.hpp +++ b/sprout/utility/string_ref/type_traits.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_UTILITY_STRING_REF_TYPE_TRAITS_HPP #define SPROUT_UTILITY_STRING_REF_TYPE_TRAITS_HPP -#include #include #include +#include namespace sprout { // @@ -18,7 +18,7 @@ namespace sprout { // template struct is_basic_string_ref - : public std::false_type + : public sprout::false_type {}; template struct is_basic_string_ref @@ -30,7 +30,7 @@ namespace sprout { {}; template struct is_basic_string_ref > - : public std::true_type + : public sprout::true_type {}; // @@ -38,7 +38,7 @@ namespace sprout { // template struct is_string_ref_of - : public std::false_type + : public sprout::false_type {}; template struct is_string_ref_of @@ -50,7 +50,7 @@ namespace sprout { {}; template struct is_string_ref_of, Elem> - : public std::true_type + : public sprout::true_type {}; // diff --git a/sprout/uuid/tuple.hpp b/sprout/uuid/tuple.hpp index 22aaec54..dfd80d8d 100644 --- a/sprout/uuid/tuple.hpp +++ b/sprout/uuid/tuple.hpp @@ -10,11 +10,11 @@ #include #include -#include #include #include #include #include +#include namespace sprout { // @@ -50,7 +50,7 @@ namespace std { template<> struct tuple_size { public: - typedef std::integral_constant type; + typedef sprout::integral_constant type; SPROUT_STATIC_CONSTEXPR std::size_t value = type::value; }; diff --git a/sprout/variant/type_traits.hpp b/sprout/variant/type_traits.hpp index d6e0e406..341e9495 100644 --- a/sprout/variant/type_traits.hpp +++ b/sprout/variant/type_traits.hpp @@ -8,9 +8,9 @@ #ifndef SPROUT_VARIANT_TYPE_TRAITS_HPP #define SPROUT_VARIANT_TYPE_TRAITS_HPP -#include #include #include +#include namespace sprout { // @@ -18,7 +18,7 @@ namespace sprout { // template struct is_variant - : public std::false_type + : public sprout::false_type {}; template struct is_variant @@ -30,7 +30,7 @@ namespace sprout { {}; template struct is_variant > - : public std::true_type + : public sprout::true_type {}; } // namespace sprout diff --git a/sprout/weed/detail/is_both_tuple.hpp b/sprout/weed/detail/is_both_tuple.hpp index 4f2f7503..d2c3beef 100644 --- a/sprout/weed/detail/is_both_tuple.hpp +++ b/sprout/weed/detail/is_both_tuple.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -17,7 +18,7 @@ namespace sprout { namespace detail { template struct is_both_tuple - : public std::false_type + : public sprout::false_type {}; template struct is_both_tuple< @@ -28,7 +29,7 @@ namespace sprout { && sprout::weed::traits::is_tuple::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_both_unused.hpp b/sprout/weed/detail/is_both_unused.hpp index ea2f7e06..e53bd0e4 100644 --- a/sprout/weed/detail/is_both_unused.hpp +++ b/sprout/weed/detail/is_both_unused.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -17,7 +18,7 @@ namespace sprout { namespace detail { template struct is_both_unused - : public std::false_type + : public sprout::false_type {}; template struct is_both_unused< @@ -28,7 +29,7 @@ namespace sprout { && sprout::weed::traits::is_unused::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_container_and_elem.hpp b/sprout/weed/detail/is_container_and_elem.hpp index d8b55cf3..78354a35 100644 --- a/sprout/weed/detail/is_container_and_elem.hpp +++ b/sprout/weed/detail/is_container_and_elem.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -17,7 +18,7 @@ namespace sprout { namespace detail { template struct is_container_and_elem - : public std::false_type + : public sprout::false_type {}; template struct is_container_and_elem< @@ -31,7 +32,7 @@ namespace sprout { >::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_different_elem.hpp b/sprout/weed/detail/is_different_elem.hpp index 2293df73..3b60590d 100644 --- a/sprout/weed/detail/is_different_elem.hpp +++ b/sprout/weed/detail/is_different_elem.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -23,7 +24,7 @@ namespace sprout { namespace detail { template struct is_different_elem - : public std::false_type + : public sprout::false_type {}; template struct is_different_elem< @@ -41,7 +42,7 @@ namespace sprout { && !sprout::weed::traits::is_unused::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_elem_and_container.hpp b/sprout/weed/detail/is_elem_and_container.hpp index 3c9d628c..a5e92999 100644 --- a/sprout/weed/detail/is_elem_and_container.hpp +++ b/sprout/weed/detail/is_elem_and_container.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -17,7 +18,7 @@ namespace sprout { namespace detail { template struct is_elem_and_container - : public std::false_type + : public sprout::false_type {}; template struct is_elem_and_container< @@ -31,7 +32,7 @@ namespace sprout { >::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_elem_and_tuple.hpp b/sprout/weed/detail/is_elem_and_tuple.hpp index 7fba52ae..c98bbcfc 100644 --- a/sprout/weed/detail/is_elem_and_tuple.hpp +++ b/sprout/weed/detail/is_elem_and_tuple.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -18,7 +19,7 @@ namespace sprout { namespace detail { template struct is_elem_and_tuple - : public std::false_type + : public sprout::false_type {}; template struct is_elem_and_tuple< @@ -30,7 +31,7 @@ namespace sprout { && sprout::weed::traits::is_tuple::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_elem_and_unused.hpp b/sprout/weed/detail/is_elem_and_unused.hpp index 7b11fc2f..63f45e1c 100644 --- a/sprout/weed/detail/is_elem_and_unused.hpp +++ b/sprout/weed/detail/is_elem_and_unused.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -17,7 +18,7 @@ namespace sprout { namespace detail { template struct is_elem_and_unused - : public std::false_type + : public sprout::false_type {}; template struct is_elem_and_unused< @@ -28,7 +29,7 @@ namespace sprout { && sprout::weed::traits::is_unused::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_same_container.hpp b/sprout/weed/detail/is_same_container.hpp index ba5a6e2a..dd189336 100644 --- a/sprout/weed/detail/is_same_container.hpp +++ b/sprout/weed/detail/is_same_container.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -17,7 +18,7 @@ namespace sprout { namespace detail { template struct is_same_container - : public std::false_type + : public sprout::false_type {}; template struct is_same_container< @@ -32,7 +33,7 @@ namespace sprout { >::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_same_elem.hpp b/sprout/weed/detail/is_same_elem.hpp index 0a9e6c2f..6c9a13d8 100644 --- a/sprout/weed/detail/is_same_elem.hpp +++ b/sprout/weed/detail/is_same_elem.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -23,7 +24,7 @@ namespace sprout { namespace detail { template struct is_same_elem - : public std::false_type + : public sprout::false_type {}; template struct is_same_elem< @@ -41,7 +42,7 @@ namespace sprout { && !sprout::weed::traits::is_unused::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_tuple_and_elem.hpp b/sprout/weed/detail/is_tuple_and_elem.hpp index ecfa6bd3..8c3540b4 100644 --- a/sprout/weed/detail/is_tuple_and_elem.hpp +++ b/sprout/weed/detail/is_tuple_and_elem.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -18,7 +19,7 @@ namespace sprout { namespace detail { template struct is_tuple_and_elem - : public std::false_type + : public sprout::false_type {}; template struct is_tuple_and_elem< @@ -30,7 +31,7 @@ namespace sprout { && !sprout::weed::traits::is_unused::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/detail/is_unused_and_elem.hpp b/sprout/weed/detail/is_unused_and_elem.hpp index dbbe7738..ce486597 100644 --- a/sprout/weed/detail/is_unused_and_elem.hpp +++ b/sprout/weed/detail/is_unused_and_elem.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -17,7 +18,7 @@ namespace sprout { namespace detail { template struct is_unused_and_elem - : public std::false_type + : public sprout::false_type {}; template struct is_unused_and_elem< @@ -28,7 +29,7 @@ namespace sprout { && !sprout::weed::traits::is_unused::value >::type > - : public std::true_type + : public sprout::true_type {}; } // namespace detail } // namespace weed diff --git a/sprout/weed/parser/lim.hpp b/sprout/weed/parser/lim.hpp index 0e3c18b4..661eced8 100644 --- a/sprout/weed/parser/lim.hpp +++ b/sprout/weed/parser/lim.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -91,7 +92,7 @@ namespace sprout { // template struct limit_of, Iterator, Context> - : public std::integral_constant + : public sprout::integral_constant {}; } // namespace traits } // namespace weed diff --git a/sprout/weed/traits/expr/is_expr.hpp b/sprout/weed/traits/expr/is_expr.hpp index fa19edc6..43f64ee2 100644 --- a/sprout/weed/traits/expr/is_expr.hpp +++ b/sprout/weed/traits/expr/is_expr.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -20,7 +21,7 @@ namespace sprout { // template struct is_expr - : public std::false_type + : public sprout::false_type {}; template struct is_expr @@ -36,7 +37,7 @@ namespace sprout { {}; template struct is_expr > - : public std::true_type + : public sprout::true_type {}; } // namespace traits } // namespace weed diff --git a/sprout/weed/traits/parser/is_parser.hpp b/sprout/weed/traits/parser/is_parser.hpp index b8833326..b064b663 100644 --- a/sprout/weed/traits/parser/is_parser.hpp +++ b/sprout/weed/traits/parser/is_parser.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -32,7 +33,7 @@ namespace sprout { && !std::is_const::value >::type > - : public std::true_type + : public sprout::true_type {}; template struct is_parser< @@ -42,7 +43,7 @@ namespace sprout { && !std::is_const::value >::type > - : public std::true_type + : public sprout::true_type {}; template struct is_parser< @@ -52,7 +53,7 @@ namespace sprout { && !std::is_const::value >::type > - : public std::true_type + : public sprout::true_type {}; template struct is_parser< @@ -62,7 +63,7 @@ namespace sprout { && !std::is_const::value >::type > - : public std::true_type + : public sprout::true_type {}; template struct is_parser< diff --git a/sprout/weed/traits/parser/limit_of.hpp b/sprout/weed/traits/parser/limit_of.hpp index 76b4cb0a..78fda142 100644 --- a/sprout/weed/traits/parser/limit_of.hpp +++ b/sprout/weed/traits/parser/limit_of.hpp @@ -9,8 +9,8 @@ #define SPROUT_WEED_TRAITS_PARSER_LIMIT_OF_HPP #include -#include #include +#include #include #include @@ -22,7 +22,7 @@ namespace sprout { // template struct limit_of - : public std::integral_constant(-1)> + : public sprout::integral_constant(-1)> {}; template struct limit_of diff --git a/sprout/weed/traits/type/is_container.hpp b/sprout/weed/traits/type/is_container.hpp index 7d691635..db51de0b 100644 --- a/sprout/weed/traits/type/is_container.hpp +++ b/sprout/weed/traits/type/is_container.hpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace sprout { namespace weed { @@ -21,7 +22,7 @@ namespace sprout { // template struct is_container - : public std::false_type + : public sprout::false_type {}; template struct is_container @@ -37,11 +38,11 @@ namespace sprout { {}; template struct is_container > - : public std::true_type + : public sprout::true_type {}; template struct is_container > - : public std::true_type + : public sprout::true_type {}; } // namespace traits } // namespace weed diff --git a/sprout/weed/traits/type/is_string.hpp b/sprout/weed/traits/type/is_string.hpp index e7469c0d..91acb7dd 100644 --- a/sprout/weed/traits/type/is_string.hpp +++ b/sprout/weed/traits/type/is_string.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace sprout { namespace weed { @@ -20,7 +21,7 @@ namespace sprout { // template struct is_string - : public std::false_type + : public sprout::false_type {}; template struct is_string @@ -36,7 +37,7 @@ namespace sprout { {}; template struct is_string > - : public std::true_type + : public sprout::true_type {}; } // namespace traits } // namespace weed diff --git a/sprout/weed/traits/type/is_tuple.hpp b/sprout/weed/traits/type/is_tuple.hpp index da4da7da..5b954c44 100644 --- a/sprout/weed/traits/type/is_tuple.hpp +++ b/sprout/weed/traits/type/is_tuple.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace sprout { namespace weed { @@ -20,7 +21,7 @@ namespace sprout { // template struct is_tuple - : public std::false_type + : public sprout::false_type {}; template struct is_tuple @@ -36,7 +37,7 @@ namespace sprout { {}; template struct is_tuple > - : public std::true_type + : public sprout::true_type {}; } // namespace traits } // namespace weed diff --git a/sprout/weed/traits/type/is_unused.hpp b/sprout/weed/traits/type/is_unused.hpp index 59e70c52..9ad70f0e 100644 --- a/sprout/weed/traits/type/is_unused.hpp +++ b/sprout/weed/traits/type/is_unused.hpp @@ -10,6 +10,7 @@ #include #include +#include #include namespace sprout { @@ -20,7 +21,7 @@ namespace sprout { // template struct is_unused - : public std::false_type + : public sprout::false_type {}; template struct is_unused @@ -36,7 +37,7 @@ namespace sprout { {}; template<> struct is_unused - : public std::true_type + : public sprout::true_type {}; } // namespace traits } // namespace weed