External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSVC2015 fix

Browse Source
This commit is contained in:
vsol 2020-03-10 13:50:04 +03:00
parent c3c6d0c2d2
commit 448fb74633
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/fmt/core.h
View File

@ -969,6 +969,11 @@ template <typename Context> struct arg_mapper {
return val; return val;
} }
FMT_CONSTEXPR const named_arg_base<char_type>& map(
const named_arg_base<char_type>& val){
return val;
}
int map(...) { int map(...) {
constexpr bool formattable = sizeof(Context) == 0; constexpr bool formattable = sizeof(Context) == 0;
static_assert( static_assert(
@ -1005,10 +1010,6 @@ template <typename Context> class basic_format_arg {
friend FMT_CONSTEXPR basic_format_arg<ContextType> internal::make_arg( friend FMT_CONSTEXPR basic_format_arg<ContextType> internal::make_arg(
const T& value); const T& value);
template <typename ContextType>
friend FMT_CONSTEXPR basic_format_arg<ContextType> internal::make_arg(
const internal::named_arg_base<typename ContextType::char_type>& value);
template <typename Visitor, typename Ctx> template <typename Visitor, typename Ctx>
friend FMT_CONSTEXPR auto visit_format_arg(Visitor&& vis, friend FMT_CONSTEXPR auto visit_format_arg(Visitor&& vis,
const basic_format_arg<Ctx>& arg) const basic_format_arg<Ctx>& arg)
@ -1181,15 +1182,6 @@ template <bool IS_PACKED, typename Context, typename T,
inline basic_format_arg<Context> make_arg(const T& value) { inline basic_format_arg<Context> make_arg(const T& value) {
return make_arg<Context>(value); return make_arg<Context>(value);
} }
template <typename Context>
FMT_CONSTEXPR basic_format_arg<Context> make_arg(
const named_arg_base<typename Context::char_type>& value) {
basic_format_arg<Context> arg;
arg.type_ = type::named_arg_type;
arg.value_ = value;
return arg;
}
} // namespace internal } // namespace internal
// Formatting context. // Formatting context.

2
include/fmt/dyn-args.h
View File

@ -191,6 +191,8 @@ class dynamic_format_arg_store
internal::arg_mapper<Context>().map(named_with_stored_parts); internal::arg_mapper<Context>().map(named_with_stored_parts);
named_args_.push_front(named_with_stored_parts); named_args_.push_front(named_with_stored_parts);
data_.emplace_back(internal::make_arg<Context>(named_args_.front())); data_.emplace_back(internal::make_arg<Context>(named_args_.front()));
// data_.emplace_back(internal::make_arg_from_serialized_named<Context>(
// named_args_.front()));
} }
}; };