diff --git a/include/fmt/base.h b/include/fmt/base.h index 2ff2bb1e..cd49593f 100644 --- a/include/fmt/base.h +++ b/include/fmt/base.h @@ -2145,48 +2145,54 @@ template class value { named_arg_value named_args; }; - constexpr FMT_INLINE value() : no_value() {} - constexpr FMT_INLINE value(signed char x) : int_value(x) {} - constexpr FMT_INLINE value(unsigned char x FMT_BUILTIN) : uint_value(x) {} - constexpr FMT_INLINE value(signed short x) : int_value(x) {} - constexpr FMT_INLINE value(unsigned short x FMT_BUILTIN) : uint_value(x) {} - constexpr FMT_INLINE value(int x) : int_value(x) {} - constexpr FMT_INLINE value(unsigned x FMT_BUILTIN) : uint_value(x) {} - FMT_CONSTEXPR FMT_INLINE value(long x FMT_BUILTIN) : value(long_type(x)) {} - FMT_CONSTEXPR FMT_INLINE value(unsigned long x FMT_BUILTIN) + constexpr FMT_ALWAYS_INLINE value() : no_value() {} + constexpr FMT_ALWAYS_INLINE value(signed char x) : int_value(x) {} + constexpr FMT_ALWAYS_INLINE value(unsigned char x FMT_BUILTIN) + : uint_value(x) {} + constexpr FMT_ALWAYS_INLINE value(signed short x) : int_value(x) {} + constexpr FMT_ALWAYS_INLINE value(unsigned short x FMT_BUILTIN) + : uint_value(x) {} + constexpr FMT_ALWAYS_INLINE value(int x) : int_value(x) {} + constexpr FMT_ALWAYS_INLINE value(unsigned x FMT_BUILTIN) : uint_value(x) {} + FMT_CONSTEXPR FMT_ALWAYS_INLINE value(long x FMT_BUILTIN) + : value(long_type(x)) {} + FMT_CONSTEXPR FMT_ALWAYS_INLINE value(unsigned long x FMT_BUILTIN) : value(ulong_type(x)) {} - constexpr FMT_INLINE value(long long x FMT_BUILTIN) : long_long_value(x) {} - constexpr FMT_INLINE value(unsigned long long x FMT_BUILTIN) + constexpr FMT_ALWAYS_INLINE value(long long x FMT_BUILTIN) + : long_long_value(x) {} + constexpr FMT_ALWAYS_INLINE value(unsigned long long x FMT_BUILTIN) : ulong_long_value(x) {} - FMT_INLINE value(int128_opt x FMT_BUILTIN) : int128_value(x) {} - FMT_INLINE value(uint128_opt x FMT_BUILTIN) : uint128_value(x) {} - constexpr FMT_INLINE value(bool x FMT_BUILTIN) : bool_value(x) {} + FMT_ALWAYS_INLINE value(int128_opt x FMT_BUILTIN) : int128_value(x) {} + FMT_ALWAYS_INLINE value(uint128_opt x FMT_BUILTIN) : uint128_value(x) {} + constexpr FMT_ALWAYS_INLINE value(bool x FMT_BUILTIN) : bool_value(x) {} template - constexpr FMT_INLINE value(bitint x FMT_BUILTIN) : long_long_value(x) { + constexpr FMT_ALWAYS_INLINE value(bitint x FMT_BUILTIN) + : long_long_value(x) { static_assert(N <= 64, "unsupported _BitInt"); } template - constexpr FMT_INLINE value(ubitint x FMT_BUILTIN) : ulong_long_value(x) { + constexpr FMT_ALWAYS_INLINE value(ubitint x FMT_BUILTIN) + : ulong_long_value(x) { static_assert(N <= 64, "unsupported _BitInt"); } template ::value)> - constexpr FMT_INLINE value(T x FMT_BUILTIN) : char_value(x) { + constexpr FMT_ALWAYS_INLINE value(T x FMT_BUILTIN) : char_value(x) { static_assert( std::is_same::value || std::is_same::value, "mixing character types is disallowed"); } - constexpr FMT_INLINE value(float x FMT_BUILTIN) : float_value(x) {} - constexpr FMT_INLINE value(double x FMT_BUILTIN) : double_value(x) {} - FMT_INLINE value(long double x FMT_BUILTIN) : long_double_value(x) {} + constexpr FMT_ALWAYS_INLINE value(float x FMT_BUILTIN) : float_value(x) {} + constexpr FMT_ALWAYS_INLINE value(double x FMT_BUILTIN) : double_value(x) {} + FMT_ALWAYS_INLINE value(long double x FMT_BUILTIN) : long_double_value(x) {} - FMT_CONSTEXPR FMT_INLINE value(char_type* x FMT_BUILTIN) { + FMT_CONSTEXPR FMT_ALWAYS_INLINE value(char_type* x FMT_BUILTIN) { string.data = x; if (is_constant_evaluated()) string.size = 0; } - FMT_CONSTEXPR FMT_INLINE value(const char_type* x FMT_BUILTIN) { + FMT_CONSTEXPR FMT_ALWAYS_INLINE value(const char_type* x FMT_BUILTIN) { string.data = x; if (is_constant_evaluated()) string.size = 0; } @@ -2199,13 +2205,13 @@ template class value { string.data = sv.data(); string.size = sv.size(); } - FMT_INLINE value(void* x FMT_BUILTIN) : pointer(x) {} - FMT_INLINE value(const void* x FMT_BUILTIN) : pointer(x) {} - FMT_INLINE value(volatile void* x FMT_BUILTIN) + FMT_ALWAYS_INLINE value(void* x FMT_BUILTIN) : pointer(x) {} + FMT_ALWAYS_INLINE value(const void* x FMT_BUILTIN) : pointer(x) {} + FMT_ALWAYS_INLINE value(volatile void* x FMT_BUILTIN) : pointer(const_cast(x)) {} - FMT_INLINE value(const volatile void* x FMT_BUILTIN) + FMT_ALWAYS_INLINE value(const volatile void* x FMT_BUILTIN) : pointer(const_cast(x)) {} - FMT_INLINE value(nullptr_t) : pointer(nullptr) {} + FMT_ALWAYS_INLINE value(nullptr_t) : pointer(nullptr) {} template ::value || std::is_member_pointer::value)> @@ -2227,7 +2233,7 @@ template class value { template ::value || !FMT_BUILTIN_TYPES)> - FMT_CONSTEXPR20 FMT_INLINE value(T& x) : value(x, custom_tag()) {} + FMT_CONSTEXPR20 FMT_ALWAYS_INLINE value(T& x) : value(x, custom_tag()) {} FMT_ALWAYS_INLINE value(const named_arg_info* args, size_t size) : named_args{args, size} {}