feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Simplify formatter selection

Browse Source
This commit is contained in:
Victor Zverovich
2019-01-30 19:39:42 -08:00
parent 7ca8fc3b17
commit 3f52336e6c
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/fmt/core.h
View File

@@ -629,31 +629,20 @@ template <typename Context> class value {
} }
value(const void* val) { pointer = val; } value(const void* val) { pointer = val; }
template < template <typename T> explicit value(const T& val) {
typename T,
typename std::enable_if<
!is_constructible<typename Context::template formatter_type<T>::type,
internal::dummy_formatter_arg>::value,
int>::type = 0>
explicit value(const T& val) {
custom.value = &val; custom.value = &val;
// Get the formatter type through the context to allow different contexts // Get the formatter type through the context to allow different contexts
// have different extension points, e.g. `formatter<T>` for `format` and // have different extension points, e.g. `formatter<T>` for `format` and
// `printf_formatter<T>` for `printf`. // `printf_formatter<T>` for `printf`.
typedef typename Context::template formatter_type<T>::type formatter; typedef typename Context::template formatter_type<T>::type formatter;
custom.format = &format_custom_arg<T, formatter>; enum {
} formattable =
!is_constructible<formatter, internal::dummy_formatter_arg>::value
template < };
typename T, custom.format = &format_custom_arg<
typename std::enable_if< T, typename std::conditional<
is_constructible<typename Context::template formatter_type<T>::type, formattable, formatter,
internal::dummy_formatter_arg>::value, internal::fallback_formatter<T, char_type>>::type>;
int>::type = 0>
explicit value(const T& val) {
custom.value = &val;
custom.format =
&format_custom_arg<T, internal::fallback_formatter<T, char_type>>;
} }
const named_arg_base<char_type>& as_named_arg() { const named_arg_base<char_type>& as_named_arg() {