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

revert back FMT_INLINE removed in #2056

Browse Source
This commit is contained in:
Alexey Ochapov 2020-12-27 08:08:14 +03:00
parent 4b6b13db02
commit f5e9b8699d
No known key found for this signature in database
GPG Key ID: 9DC52E8F031B8DA8
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/fmt/core.h
View File

@ -946,9 +946,9 @@ struct arg_data<T, Char, NUM_ARGS, 0> {
T args_[NUM_ARGS != 0 ? NUM_ARGS : +1]; T args_[NUM_ARGS != 0 ? NUM_ARGS : +1];
template <typename... U> template <typename... U>
FMT_CONSTEXPR arg_data(const U&... init) : args_{init...} {} FMT_CONSTEXPR FMT_INLINE arg_data(const U&... init) : args_{init...} {}
FMT_CONSTEXPR const T* args() const { return args_; } FMT_CONSTEXPR FMT_INLINE const T* args() const { return args_; }
FMT_CONSTEXPR std::nullptr_t named_args() { return nullptr; } FMT_CONSTEXPR FMT_INLINE std::nullptr_t named_args() { return nullptr; }
}; };
template <typename Char> template <typename Char>
@ -969,7 +969,8 @@ void init_named_args(named_arg_info<Char>* named_args, int arg_count,
} }
template <typename... Args> template <typename... Args>
FMT_CONSTEXPR void init_named_args(std::nullptr_t, int, int, const Args&...) {} FMT_CONSTEXPR FMT_INLINE void init_named_args(std::nullptr_t, int, int,
const Args&...) {}
template <typename T> struct is_named_arg : std::false_type {}; template <typename T> struct is_named_arg : std::false_type {};
@ -1090,11 +1091,11 @@ template <typename Context> class value {
FMT_INLINE value(long double val) : long_double_value(val) {} FMT_INLINE value(long double val) : long_double_value(val) {}
constexpr FMT_INLINE value(bool val) : bool_value(val) {} constexpr FMT_INLINE value(bool val) : bool_value(val) {}
constexpr FMT_INLINE value(char_type val) : char_value(val) {} constexpr FMT_INLINE value(char_type val) : char_value(val) {}
FMT_CONSTEXPR value(const char_type* val) { FMT_CONSTEXPR FMT_INLINE value(const char_type* val) {
string.data = val; string.data = val;
if (is_constant_evaluated()) string.size = {}; if (is_constant_evaluated()) string.size = {};
} }
FMT_CONSTEXPR value(basic_string_view<char_type> val) { FMT_CONSTEXPR FMT_INLINE value(basic_string_view<char_type> val) {
string.data = val.data(); string.data = val.data();
string.size = val.size(); string.size = val.size();
} }
@ -1685,7 +1686,8 @@ template <typename Context> class basic_format_args {
\endrst \endrst
*/ */
template <typename... Args> template <typename... Args>
constexpr basic_format_args(const format_arg_store<Context, Args...>& store) constexpr FMT_INLINE basic_format_args(
const format_arg_store<Context, Args...>& store)
: basic_format_args(store.desc, store.data_.args()) {} : basic_format_args(store.desc, store.data_.args()) {}
/** /**
@ -1694,7 +1696,8 @@ template <typename Context> class basic_format_args {
`~fmt::dynamic_format_arg_store`. `~fmt::dynamic_format_arg_store`.
\endrst \endrst
*/ */
constexpr basic_format_args(const dynamic_format_arg_store<Context>& store) constexpr FMT_INLINE basic_format_args(
const dynamic_format_arg_store<Context>& store)
: basic_format_args(store.get_types(), store.data()) {} : basic_format_args(store.get_types(), store.data()) {}
/** /**

2
include/fmt/format.h
View File

@ -2317,7 +2317,7 @@ class arg_formatter_base {
} }
template <typename T, FMT_ENABLE_IF(is_integral<T>::value)> template <typename T, FMT_ENABLE_IF(is_integral<T>::value)>
FMT_CONSTEXPR iterator operator()(T value) { FMT_CONSTEXPR FMT_INLINE iterator operator()(T value) {
if (specs_) if (specs_)
write_int(value, *specs_); write_int(value, *specs_);
else else