fix type_traits/aliases.hpp

sprout/algorithm/string/join.hpp

@@ -8,7 +8,7 @@
 #include <sprout/index_tuple.hpp>
 #include <sprout/pit.hpp>
 #include <sprout/iterator/traits.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/range/adaptor/size_enumed.hpp>
 #include <sprout/range/algorithm/lower_bound.hpp>
 #include <sprout/range/numeric/partial_sum.hpp>

sprout/cinttypes/abs.hpp

@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	SPROUT_CONSTEXPR std::intmax_t imaxabs(std::intmax_t j) {

sprout/cinttypes/div.hpp

@@ -7,7 +7,7 @@
 #include <cinttypes>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/cstdlib/abs.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	// Copyright (C) 2011 RiSK (sscrisk)

sprout/cstdlib/ascii_to_int.hpp

@@ -7,7 +7,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/ctype/ascii.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/cstdlib/div.hpp

@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	// Copyright (C) 2011 RiSK (sscrisk)

sprout/cstdlib/str_to_float.hpp

@@ -8,7 +8,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/ctype/ascii.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/cstdlib/str_to_int.hpp

@@ -9,7 +9,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/ctype/ascii.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/detail/char_conversion.hpp>
 
 namespace sprout {

sprout/detail/float.hpp

@@ -4,7 +4,7 @@
 #include <cmath>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/detail/int.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/io.hpp

@@ -11,7 +11,7 @@
 #include <sprout/string.hpp>
 #include <sprout/pit.hpp>
 #include <sprout/utility/value_holder.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/range/algorithm/lower_bound.hpp>
 #include <sprout/range/numeric/partial_sum.hpp>
 #include <sprout/type_traits/is_char_type.hpp>

sprout/math/abs.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/acos.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/asin.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/acosh.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/log.hpp>
 #include <sprout/math/sqrt.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/asin.hpp

@@ -8,7 +8,7 @@
 #include <sprout/math/constants.hpp>
 #include <sprout/math/factorial.hpp>
 #include <sprout/math/sqrt.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/asinh.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/log.hpp>
 #include <sprout/math/sqrt.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/atan.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/constants.hpp>
 #include <sprout/math/factorial.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/atan2.hpp

@@ -6,7 +6,7 @@
 #include <sprout/math/atan.hpp>
 #include <sprout/math/constants.hpp>
 #include <sprout/math/float_promote.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/atanh.hpp

@@ -5,7 +5,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/log.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/cbrt.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/pow.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/cos.hpp

@@ -6,7 +6,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/factorial.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/cosh.hpp

@@ -5,7 +5,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/factorial.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/exp.hpp

@@ -5,7 +5,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/factorial.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/exp10.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/exp.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace math {

sprout/math/exp2.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/exp.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/expm1.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/exp.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/fabs.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/fdim.hpp

@@ -4,7 +4,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/float_promote.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/fma.hpp

@@ -4,7 +4,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/float_promote.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/fmax.hpp

@@ -4,7 +4,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/float_promote.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/fmin.hpp

@@ -4,7 +4,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/float_promote.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/fpclassify.hpp

@@ -4,7 +4,7 @@
 #include <cmath>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/math/isnan.hpp>
 #include <sprout/math/isinf.hpp>
 #include <sprout/math/iszero.hpp>

sprout/math/hypot.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/float_promote.hpp>
 #include <sprout/math/sqrt.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/isfinite.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/math/isnan.hpp>
 #include <sprout/math/isinf.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION

sprout/math/isinf.hpp

@@ -4,7 +4,7 @@
 #include <limits>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/isnan.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/isnormal.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/math/isnan.hpp>
 #include <sprout/math/isinf.hpp>
 #include <sprout/math/issubnormal.hpp>

sprout/math/issubnormal.hpp

@@ -4,7 +4,7 @@
 #include <limits>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/math/iszero.hpp>
 
 namespace sprout {

sprout/math/iszero.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace math {

sprout/math/log.hpp

@@ -8,7 +8,7 @@
 #include <sprout/math/constants.hpp>
 #include <sprout/math/factorial.hpp>
 #include <sprout/math/sqrt.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/log10.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/log.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/log1p.hpp

@@ -4,7 +4,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/log.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/log2.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/log.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/pow.hpp

@@ -7,7 +7,7 @@
 #include <sprout/math/log.hpp>
 #include <sprout/math/constants.hpp>
 #include <sprout/math/float_promote.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/signbit.hpp

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/sin.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/cos.hpp>
 #include <sprout/math/constants.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/sinh.hpp

@@ -5,7 +5,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/math/factorial.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/sqrt.hpp

@@ -4,7 +4,7 @@
 #include <limits>
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/tan.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/sin.hpp>
 #include <sprout/math/cos.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/math/tanh.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/math/sinh.hpp>
 #include <sprout/math/cosh.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
 #	include <cmath>
 #endif

sprout/string/float_to_string.hpp

@@ -7,7 +7,7 @@
 #include <sprout/config.hpp>
 #include <sprout/index_tuple.hpp>
 #include <sprout/string/string.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/detail/char_conversion.hpp>
 #include <sprout/detail/int.hpp>
 #include <sprout/detail/float.hpp>

sprout/string/int_to_string.hpp

@@ -7,7 +7,7 @@
 #include <sprout/index_tuple.hpp>
 #include <sprout/string/string.hpp>
 #include <sprout/integer/integer_digits.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/detail/char_conversion.hpp>
 #include <sprout/detail/int.hpp>
 

sprout/string/string_to_float.hpp

@@ -7,7 +7,7 @@
 #include <sprout/config.hpp>
 #include <sprout/string/string.hpp>
 #include <sprout/cstdlib/str_to_float.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/string/string_to_int.hpp

@@ -8,7 +8,7 @@
 #include <sprout/config.hpp>
 #include <sprout/string/string.hpp>
 #include <sprout/cstdlib/str_to_int.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/type_traits/aliases.hpp

@@ -85,6 +85,81 @@ namespace sprout {
 	using underlying_type_ = typename std::underlying_type<T>::type;
 	template<typename F, typename... ArgTypes>
 	using result_of_ = typename std::result_of<F(ArgTypes...)>::type;
+
+
+	//
+	// Const-volatility specifiers
+	//
+	template<typename T>
+	using remove_const = sprout::remove_const_<T>;
+	template<typename T>
+	using remove_volatile = sprout::remove_volatile_<T>;
+	template<typename T>
+	using remove_cv = sprout::remove_cv_<T>;
+	template<typename T>
+	using add_const = sprout::add_const_<T>;
+	template<typename T>
+	using add_volatile = sprout::add_volatile_<T>;
+	template<typename T>
+	using add_cv = sprout::add_cv_<T>;
+
+	//
+	// References
+	//
+	template<typename T>
+	using remove_reference = sprout::remove_reference_<T>;
+	template<typename T>
+	using add_lvalue_reference = sprout::add_lvalue_reference_<T>;
+	template<typename T>
+	using add_rvalue_reference = sprout::add_rvalue_reference_<T>;
+
+	//
+	// Pointers
+	//
+	template<typename T>
+	using remove_pointer = sprout::remove_pointer_<T>;
+	template<typename T>
+	using add_pointer = sprout::add_pointer_<T>;
+
+	//
+	// Sign modifiers
+	//
+	template<typename T>
+	using make_signed = sprout::make_signed_<T>;
+	template<typename T>
+	using make_unsigned = sprout::make_unsigned_<T>;
+
+	//
+	// Arrays
+	//
+	template<typename T>
+	using remove_extent = sprout::remove_extent_<T>;
+	template<typename T>
+	using remove_all_extents = sprout::remove_all_extents_<T>;
+
+	//
+	// Miscellaneous transformations
+	//
+	template<
+		std::size_t Len,
+		std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value
+	>
+	using aligned_storage = sprout::aligned_storage_<Len, Align>;
+	// !!!
+	//template<std::size_t Len, typename... Types>
+	//using aligned_union = sprout::aligned_union_<Len, Types...>;
+	template<typename T>
+	using decay = sprout::decay_<T>;
+	template<bool B, typename T = void>
+	using enable_if = sprout::enable_if_<B, T>;
+	template<bool B, typename T, typename F>
+	using conditional = sprout::conditional_<B, T, F>;
+	template<typename... Types>
+	using common_type = sprout::common_type_<Types...>;
+	template<typename T>
+	using underlying_type = sprout::underlying_type_<T>;
+	template<typename F, typename... ArgTypes>
+	using result_of = sprout::result_of_<F, ArgTypes...>;
 #endif	// #if SPROUT_USE_TEMPLATE_ALIASES
 }	// namespace sprout
 

sprout/utility/pack.hpp

@@ -5,7 +5,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/utility/forward.hpp>
-#include <sprout/utility/enabler_if.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 
 namespace sprout {
 	//