leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:fmtlib/fmt

Browse Source
This commit is contained in:
Victor Zverovich
2021-06-01 13:38:26 -07:00
parent ed2a6377e7 9976869549
commit ad97258915
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/core.h
View File

@@ -1140,7 +1140,7 @@ template <typename Context> class value {
FMT_INLINE value(const named_arg_info<char_type>* args, size_t size)
: named_args{args, size} {}
template <typename T> FMT_INLINE value(const T& val) {
template <typename T> FMT_CONSTEXPR FMT_INLINE value(const T& val) {
custom.value = &val;
// Get the formatter type through the context to allow different contexts
// have different extension points, e.g. `formatter<T>` for `format` and

9
include/fmt/format.h
View File

@@ -1935,10 +1935,11 @@ OutputIt write(OutputIt out, const T* value,
}
template <typename Char, typename OutputIt, typename T>
auto write(OutputIt out, const T& value) -> typename std::enable_if<
mapped_type_constant<T, basic_format_context<OutputIt, Char>>::value ==
type::custom_type,
OutputIt>::type {
FMT_CONSTEXPR auto write(OutputIt out, const T& value) ->
typename std::enable_if<
mapped_type_constant<T, basic_format_context<OutputIt, Char>>::value ==
type::custom_type,
OutputIt>::type {
using context_type = basic_format_context<OutputIt, Char>;
using formatter_type =
conditional_t<has_formatter<T, context_type>::value,