From 2236d03165e1064d85821a094999c13d25a2620e Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Wed, 7 Aug 2013 09:54:38 +0900 Subject: [PATCH] fic confi/stdlib.hpp --- sprout/config/stdlib/dinkumware.hpp | 1 + sprout/config/stdlib/libcomo.hpp | 1 + sprout/config/stdlib/modena.hpp | 1 + sprout/config/stdlib/msl.hpp | 1 + sprout/config/stdlib/roguewave.hpp | 1 + sprout/config/stdlib/sgi.hpp | 1 + sprout/config/stdlib/stlport.hpp | 1 + sprout/config/stdlib/vacpp.hpp | 1 + sprout/limits.hpp | 46 ++++++++++++++--------------- 9 files changed, 31 insertions(+), 23 deletions(-) diff --git a/sprout/config/stdlib/dinkumware.hpp b/sprout/config/stdlib/dinkumware.hpp index 75ca44dc..83696805 100644 --- a/sprout/config/stdlib/dinkumware.hpp +++ b/sprout/config/stdlib/dinkumware.hpp @@ -14,6 +14,7 @@ # define SPROUT_NO_CXX11_HDR_TUPLE # define SPROUT_NO_CXX11_HDR_TYPEINDEX # define SPROUT_NO_CXX11_HDR_FUNCTIONAL +# define SPROUT_NO_CXX11_CHAR_TRAITS # define SPROUT_NO_CXX11_NUMERIC_LIMITS # define SPROUT_NO_CXX11_SMART_PTR #endif diff --git a/sprout/config/stdlib/libcomo.hpp b/sprout/config/stdlib/libcomo.hpp index a57fad0e..b2eb0eb8 100644 --- a/sprout/config/stdlib/libcomo.hpp +++ b/sprout/config/stdlib/libcomo.hpp @@ -19,6 +19,7 @@ #define SPROUT_NO_CXX11_HDR_TYPEINDEX #define SPROUT_NO_CXX11_HDR_UNORDERED_MAP #define SPROUT_NO_CXX11_HDR_UNORDERED_SET +#define SPROUT_NO_CXX11_CHAR_TRAITS #define SPROUT_NO_CXX11_NUMERIC_LIMITS #define SPROUT_NO_CXX11_ALLOCATOR #define SPROUT_NO_CXX11_ATOMIC_SMART_PTR diff --git a/sprout/config/stdlib/modena.hpp b/sprout/config/stdlib/modena.hpp index d7ae327e..f10fb7c6 100644 --- a/sprout/config/stdlib/modena.hpp +++ b/sprout/config/stdlib/modena.hpp @@ -19,6 +19,7 @@ #define SPROUT_NO_CXX11_HDR_TYPEINDEX #define SPROUT_NO_CXX11_HDR_UNORDERED_MAP #define SPROUT_NO_CXX11_HDR_UNORDERED_SET +#define SPROUT_NO_CXX11_CHAR_TRAITS #define SPROUT_NO_CXX11_NUMERIC_LIMITS #define SPROUT_NO_CXX11_ALLOCATOR #define SPROUT_NO_CXX11_ATOMIC_SMART_PTR diff --git a/sprout/config/stdlib/msl.hpp b/sprout/config/stdlib/msl.hpp index 1a5af599..069fb74f 100644 --- a/sprout/config/stdlib/msl.hpp +++ b/sprout/config/stdlib/msl.hpp @@ -19,6 +19,7 @@ #define SPROUT_NO_CXX11_HDR_TYPEINDEX #define SPROUT_NO_CXX11_HDR_UNORDERED_MAP #define SPROUT_NO_CXX11_HDR_UNORDERED_SET +#define SPROUT_NO_CXX11_CHAR_TRAITS #define SPROUT_NO_CXX11_NUMERIC_LIMITS #define SPROUT_NO_CXX11_ALLOCATOR #define SPROUT_NO_CXX11_ATOMIC_SMART_PTR diff --git a/sprout/config/stdlib/roguewave.hpp b/sprout/config/stdlib/roguewave.hpp index 282b3ceb..7a8957c5 100644 --- a/sprout/config/stdlib/roguewave.hpp +++ b/sprout/config/stdlib/roguewave.hpp @@ -22,6 +22,7 @@ #define SPROUT_NO_CXX11_HDR_TYPEINDEX #define SPROUT_NO_CXX11_HDR_UNORDERED_MAP #define SPROUT_NO_CXX11_HDR_UNORDERED_SET +#define SPROUT_NO_CXX11_CHAR_TRAITS #define SPROUT_NO_CXX11_NUMERIC_LIMITS #define SPROUT_NO_CXX11_ALLOCATOR #define SPROUT_NO_CXX11_ATOMIC_SMART_PTR diff --git a/sprout/config/stdlib/sgi.hpp b/sprout/config/stdlib/sgi.hpp index cfb3a0a6..c9377f40 100644 --- a/sprout/config/stdlib/sgi.hpp +++ b/sprout/config/stdlib/sgi.hpp @@ -19,6 +19,7 @@ #define SPROUT_NO_CXX11_HDR_TYPEINDEX #define SPROUT_NO_CXX11_HDR_UNORDERED_MAP #define SPROUT_NO_CXX11_HDR_UNORDERED_SET +#define SPROUT_NO_CXX11_CHAR_TRAITS #define SPROUT_NO_CXX11_NUMERIC_LIMITS #define SPROUT_NO_CXX11_ALLOCATOR #define SPROUT_NO_CXX11_ATOMIC_SMART_PTR diff --git a/sprout/config/stdlib/stlport.hpp b/sprout/config/stdlib/stlport.hpp index 0e028b17..6a422145 100644 --- a/sprout/config/stdlib/stlport.hpp +++ b/sprout/config/stdlib/stlport.hpp @@ -19,6 +19,7 @@ #define SPROUT_NO_CXX11_HDR_TYPEINDEX #define SPROUT_NO_CXX11_HDR_UNORDERED_MAP #define SPROUT_NO_CXX11_HDR_UNORDERED_SET +#define SPROUT_NO_CXX11_CHAR_TRAITS #define SPROUT_NO_CXX11_NUMERIC_LIMITS #define SPROUT_NO_CXX11_ALLOCATOR #define SPROUT_NO_CXX11_ATOMIC_SMART_PTR diff --git a/sprout/config/stdlib/vacpp.hpp b/sprout/config/stdlib/vacpp.hpp index 65d309d8..abbf582c 100644 --- a/sprout/config/stdlib/vacpp.hpp +++ b/sprout/config/stdlib/vacpp.hpp @@ -19,6 +19,7 @@ #define SPROUT_NO_CXX11_HDR_TYPEINDEX #define SPROUT_NO_CXX11_HDR_UNORDERED_MAP #define SPROUT_NO_CXX11_HDR_UNORDERED_SET +#define SPROUT_NO_CXX11_CHAR_TRAITS #define SPROUT_NO_CXX11_NUMERIC_LIMITS #define SPROUT_NO_CXX11_ALLOCATOR #define SPROUT_NO_CXX11_ATOMIC_SMART_PTR diff --git a/sprout/limits.hpp b/sprout/limits.hpp index 5ff72ad0..85ed3f7a 100644 --- a/sprout/limits.hpp +++ b/sprout/limits.hpp @@ -18,32 +18,32 @@ namespace sprout { private: typedef std::numeric_limits impl_type; public: - static SPROUT_CONSTEXPR bool is_specialized = impl_type::is_specialized; + SPROUT_STATIC_CONSTEXPR bool is_specialized = impl_type::is_specialized; - static SPROUT_CONSTEXPR int digits = impl_type::digits; - static SPROUT_CONSTEXPR int digits10 = impl_type::digits10; - static SPROUT_CONSTEXPR int max_digits10 = impl_type::max_digits10; - static SPROUT_CONSTEXPR bool is_signed = impl_type::is_signed; - static SPROUT_CONSTEXPR bool is_integer = impl_type::is_integer; - static SPROUT_CONSTEXPR bool is_exact = impl_type::is_exact; - static SPROUT_CONSTEXPR int radix = impl_type::radix; + SPROUT_STATIC_CONSTEXPR int digits = impl_type::digits; + SPROUT_STATIC_CONSTEXPR int digits10 = impl_type::digits10; + SPROUT_STATIC_CONSTEXPR int max_digits10 = impl_type::max_digits10; + SPROUT_STATIC_CONSTEXPR bool is_signed = impl_type::is_signed; + SPROUT_STATIC_CONSTEXPR bool is_integer = impl_type::is_integer; + SPROUT_STATIC_CONSTEXPR bool is_exact = impl_type::is_exact; + SPROUT_STATIC_CONSTEXPR int radix = impl_type::radix; - static SPROUT_CONSTEXPR int min_exponent = impl_type::min_exponent; - static SPROUT_CONSTEXPR int min_exponent10 = impl_type::min_exponent10; - static SPROUT_CONSTEXPR int max_exponent = impl_type::max_exponent; - static SPROUT_CONSTEXPR int max_exponent10 = impl_type::max_exponent10; - static SPROUT_CONSTEXPR bool has_infinity = impl_type::has_infinity; - static SPROUT_CONSTEXPR bool has_quiet_NaN = impl_type::has_quiet_NaN; - static SPROUT_CONSTEXPR bool has_signaling_NaN = impl_type::has_signaling_NaN; - static SPROUT_CONSTEXPR std::float_denorm_style has_denorm = impl_type::has_denorm; - static SPROUT_CONSTEXPR bool has_denorm_loss = impl_type::has_denorm_loss; + SPROUT_STATIC_CONSTEXPR int min_exponent = impl_type::min_exponent; + SPROUT_STATIC_CONSTEXPR int min_exponent10 = impl_type::min_exponent10; + SPROUT_STATIC_CONSTEXPR int max_exponent = impl_type::max_exponent; + SPROUT_STATIC_CONSTEXPR int max_exponent10 = impl_type::max_exponent10; + SPROUT_STATIC_CONSTEXPR bool has_infinity = impl_type::has_infinity; + SPROUT_STATIC_CONSTEXPR bool has_quiet_NaN = impl_type::has_quiet_NaN; + SPROUT_STATIC_CONSTEXPR bool has_signaling_NaN = impl_type::has_signaling_NaN; + SPROUT_STATIC_CONSTEXPR std::float_denorm_style has_denorm = impl_type::has_denorm; + SPROUT_STATIC_CONSTEXPR bool has_denorm_loss = impl_type::has_denorm_loss; - static SPROUT_CONSTEXPR bool is_iec559 = impl_type::is_iec559; - static SPROUT_CONSTEXPR bool is_bounded = impl_type::is_bounded; - static SPROUT_CONSTEXPR bool is_modulo = impl_type::is_modulo; - static SPROUT_CONSTEXPR bool traps = impl_type::traps; - static SPROUT_CONSTEXPR bool tinyness_before = impl_type::tinyness_before; - static SPROUT_CONSTEXPR std::float_round_style round_style = impl_type::round_style; + SPROUT_STATIC_CONSTEXPR bool is_iec559 = impl_type::is_iec559; + SPROUT_STATIC_CONSTEXPR bool is_bounded = impl_type::is_bounded; + SPROUT_STATIC_CONSTEXPR bool is_modulo = impl_type::is_modulo; + SPROUT_STATIC_CONSTEXPR bool traps = impl_type::traps; + SPROUT_STATIC_CONSTEXPR bool tinyness_before = impl_type::tinyness_before; + SPROUT_STATIC_CONSTEXPR std::float_round_style round_style = impl_type::round_style; }; template