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

Fixed comments

Browse Source 
Changed dispatching from tag to explicit `if`.
However I would prefer tag-based dispatching if `if constexpr`, but the
later is not available in older standards.
This commit is contained in:
vsol 2020-03-14 20:51:41 +03:00
parent 863aa63433
commit 473ba57fcf
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/fmt/core.h
View File

@ -272,6 +272,10 @@ struct monostate {};
namespace internal { namespace internal {
// A helper function to suppress bogus "conditional expression is constant"
// warnings.
template <typename T> FMT_CONSTEXPR T const_check(T value) { return value; }
// A workaround for gcc 4.8 to make void_t work in a SFINAE context. // A workaround for gcc 4.8 to make void_t work in a SFINAE context.
template <typename... Ts> struct void_t_impl { using type = void; }; template <typename... Ts> struct void_t_impl { using type = void; };
@ -1674,11 +1678,20 @@ class dyn_arg_storage {
template <typename T> struct storage_node : storage_node_base<> { template <typename T> struct storage_node : storage_node_base<> {
T value_; T value_;
FMT_CONSTEXPR explicit storage_node(const T& arg, owning_ptr&& next) template <typename Arg>
FMT_CONSTEXPR storage_node(const Arg& arg, owning_ptr&& next)
: value_{arg} { : value_{arg} {
// Must be initialised after value_ // Must be initialised after value_
next_ = std::move(next); next_ = std::move(next);
} }
template <typename Char>
FMT_CONSTEXPR storage_node(const basic_string_view<Char>& arg,
owning_ptr&& next)
: value_{arg.data(), arg.size()} {
// Must be initialised after value_
next_ = std::move(next);
}
}; };
owning_ptr head_{nullptr}; owning_ptr head_{nullptr};
@ -1739,20 +1752,6 @@ class dynamic_format_arg_store
return internal::is_unpacked_bit | data_.size(); return internal::is_unpacked_bit | data_.size();
} }
template <typename T> const T& stored_value(const T& arg, std::false_type) {
return arg;
}
template <typename T>
const T& stored_value(const std::reference_wrapper<T>& arg, std::false_type) {
return arg.get();
}
template <typename T>
const stored_type<T>& stored_value(const T& arg, std::true_type) {
return storage_.push<stored_type<T>>(arg);
}
template <typename T> void emplace_arg(const T& arg) { template <typename T> void emplace_arg(const T& arg) {
data_.emplace_back(internal::make_arg<Context>(arg)); data_.emplace_back(internal::make_arg<Context>(arg));
} }
@ -1789,8 +1788,11 @@ class dynamic_format_arg_store
static_assert( static_assert(
!std::is_base_of<internal::named_arg_base<char_type>, T>::value, !std::is_base_of<internal::named_arg_base<char_type>, T>::value,
"Named arguments are not supported yet"); "Named arguments are not supported yet");
emplace_arg(stored_value( using need_copy_t = typename internal::need_dyn_copy<T, Context>::type;
arg, typename internal::need_dyn_copy<T, Context>::type{})); if (internal::const_check(need_copy_t::value))
emplace_arg(storage_.push<stored_type<T>>(arg));
else
emplace_arg(arg);
} }
/** /**

4
include/fmt/format.h
View File

@ -213,10 +213,6 @@ FMT_END_NAMESPACE
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
namespace internal { namespace internal {
// A helper function to suppress bogus "conditional expression is constant"
// warnings.
template <typename T> FMT_CONSTEXPR T const_check(T value) { return value; }
// An equivalent of `*reinterpret_cast<Dest*>(&source)` that doesn't have // An equivalent of `*reinterpret_cast<Dest*>(&source)` that doesn't have
// undefined behavior (e.g. due to type aliasing). // undefined behavior (e.g. due to type aliasing).
// Example: uint64_t d = bit_cast<uint64_t>(2.718); // Example: uint64_t d = bit_cast<uint64_t>(2.718);