fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 03:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use standard enable_if

Browse Source
This commit is contained in:
Victor Zverovich
2017-08-26 10:41:58 -07:00
parent 64681739fd
commit 27ad6cee82
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fmt/format.h
View File

@ -819,12 +819,6 @@ class char_traits<wchar_t> : public basic_char_traits<wchar_t> {
const wchar_t *format, unsigned width, int precision, T value); const wchar_t *format, unsigned width, int precision, T value);
}; };
template <bool B, class T = void>
struct enable_if {};
template <class T>
struct enable_if<true, T> { typedef T type; };
template <bool B, class T, class F> template <bool B, class T, class F>
struct conditional { typedef T type; }; struct conditional { typedef T type; };
@ -937,12 +931,12 @@ const Char *pointer_from(null_terminating_iterator<Char> it) {
// Returns true if value is negative, false otherwise. // Returns true if value is negative, false otherwise.
// Same as (value < 0) but doesn't produce warnings if T is an unsigned type. // Same as (value < 0) but doesn't produce warnings if T is an unsigned type.
template <typename T> template <typename T>
inline typename enable_if<std::numeric_limits<T>::is_signed, bool>::type inline typename std::enable_if<std::numeric_limits<T>::is_signed, bool>::type
is_negative(T value) { is_negative(T value) {
return value < 0; return value < 0;
} }
template <typename T> template <typename T>
inline typename enable_if<!std::numeric_limits<T>::is_signed, bool>::type inline typename std::enable_if<!std::numeric_limits<T>::is_signed, bool>::type
is_negative(T) { is_negative(T) {
return false; return false;
} }
@ -1425,7 +1419,7 @@ class value {
template <typename T> template <typename T>
value(const T &value, value(const T &value,
typename enable_if<!convert_to_int<T>::value, int>::type = 0) { typename std::enable_if<!convert_to_int<T>::value, int>::type = 0) {
static_assert(internal::type<T>() == internal::CUSTOM, "invalid type"); static_assert(internal::type<T>() == internal::CUSTOM, "invalid type");
this->custom.value = &value; this->custom.value = &value;
this->custom.format = &format_custom_arg<T>; this->custom.format = &format_custom_arg<T>;
@ -1433,7 +1427,7 @@ class value {
template <typename T> template <typename T>
value(const T &value, value(const T &value,
typename enable_if<convert_to_int<T>::value, int>::type = 0) { typename std::enable_if<convert_to_int<T>::value, int>::type = 0) {
static_assert(internal::type<T>() == internal::INT, "invalid type"); static_assert(internal::type<T>() == internal::INT, "invalid type");
this->int_value = value; this->int_value = value;
} }
@ -1931,7 +1925,7 @@ class arg_formatter_base {
} }
template <typename StrChar> template <typename StrChar>
typename enable_if< typename std::enable_if<
std::is_same<Char, wchar_t>::value && std::is_same<Char, wchar_t>::value &&
std::is_same<StrChar, wchar_t>::value>::type std::is_same<StrChar, wchar_t>::value>::type
write_str(basic_string_view<StrChar> value) { write_str(basic_string_view<StrChar> value) {
@ -1939,7 +1933,7 @@ class arg_formatter_base {
} }
template <typename StrChar> template <typename StrChar>
typename enable_if< typename std::enable_if<
!std::is_same<Char, wchar_t>::value || !std::is_same<Char, wchar_t>::value ||
!std::is_same<StrChar, wchar_t>::value>::type !std::is_same<StrChar, wchar_t>::value>::type
write_str(basic_string_view<StrChar> ) { write_str(basic_string_view<StrChar> ) {
@ -3564,7 +3558,8 @@ struct format_enum : std::integral_constant<bool, std::is_enum<T>::value> {};
// Formatter of objects of type T. // Formatter of objects of type T.
template <typename T, typename Char> template <typename T, typename Char>
struct formatter<T, Char, typename std::enable_if<internal::format_type<T>::value>::type> { struct formatter<
T, Char, typename std::enable_if<internal::format_type<T>::value>::type> {
// Parses format specifiers stopping either at the end of the range or at the // Parses format specifiers stopping either at the end of the range or at the
// terminating '}'. // terminating '}'.

19
test/util-test.cc
View File

@ -840,25 +840,6 @@ TEST(UtilTest, IsEnumConvertibleToInt) {
} }
#endif #endif
template <typename T>
bool check_enable_if(
typename fmt::internal::enable_if<sizeof(T) == sizeof(int), T>::type *) {
return true;
}
template <typename T>
bool check_enable_if(
typename fmt::internal::enable_if<sizeof(T) != sizeof(int), T>::type *) {
return false;
}
TEST(UtilTest, EnableIf) {
int i = 0;
EXPECT_TRUE(check_enable_if<int>(&i));
char c = 0;
EXPECT_FALSE(check_enable_if<char>(&c));
}
TEST(UtilTest, Conditional) { TEST(UtilTest, Conditional) {
int i = 0; int i = 0;
fmt::internal::conditional<true, int, char>::type *pi = &i; fmt::internal::conditional<true, int, char>::type *pi = &i;