Skip to content

Commit 39e15af

Browse files
committed
Fix template argument ordering
1 parent d04c980 commit 39e15af

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

include/fmt/args.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ FMT_EXPORT template <typename Context> class dynamic_format_arg_store {
114114
}
115115

116116
template <typename T>
117-
void emplace_arg(const detail::named_arg<char_type, T>& arg) {
117+
void emplace_arg(const detail::named_arg<T, char_type>& arg) {
118118
if (named_info_.empty())
119119
data_.insert(data_.begin(), basic_format_arg<Context>(nullptr, 0));
120120
data_.emplace_back(detail::unwrap(arg.value));
@@ -184,7 +184,7 @@ FMT_EXPORT template <typename Context> class dynamic_format_arg_store {
184184
* copying of the argument. The name is always copied into the store.
185185
*/
186186
template <typename T>
187-
void push_back(const detail::named_arg<char_type, T>& arg) {
187+
void push_back(const detail::named_arg<T, char_type>& arg) {
188188
const char_type* arg_name =
189189
dynamic_args_.push<std::basic_string<char_type>>(arg.name).c_str();
190190
if FMT_CONSTEXPR20 (need_copy<T>::value) {

include/fmt/base.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,14 +1031,14 @@ struct is_view : std::false_type {};
10311031
template <typename T>
10321032
struct is_view<T, bool_constant<sizeof(T) != 0>> : std::is_base_of<view, T> {};
10331033

1034-
template <typename Char, typename T> struct named_arg;
1034+
template <typename T, typename Char> struct named_arg;
10351035
template <typename T> struct is_named_arg : std::false_type {};
10361036
template <typename T> struct is_static_named_arg : std::false_type {};
10371037

10381038
template <typename Char, typename T>
1039-
struct is_named_arg<named_arg<Char, T>> : std::true_type {};
1039+
struct is_named_arg<named_arg<T, Char>> : std::true_type {};
10401040

1041-
template <typename Char, typename T> struct named_arg : view {
1041+
template <typename T, typename Char = char> struct named_arg : view {
10421042
const Char* name;
10431043
const T& value;
10441044

@@ -2719,7 +2719,7 @@ using vargs =
27192719
* sufficiently new compilers. See `operator""_a()`.
27202720
*/
27212721
template <typename Char, typename T>
2722-
inline auto arg(const Char* name, const T& arg) -> detail::named_arg<Char, T> {
2722+
inline auto arg(const Char* name, const T& arg) -> detail::named_arg<T, Char> {
27232723
return {name, arg};
27242724
}
27252725

include/fmt/format.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3861,7 +3861,7 @@ struct udl_arg {
38613861
template <typename Char> struct udl_arg {
38623862
const Char* str;
38633863

3864-
template <typename T> auto operator=(T&& value) const -> named_arg<Char, T> {
3864+
template <typename T> auto operator=(T&& value) const -> named_arg<T, Char> {
38653865
return {str, std::forward<T>(value)};
38663866
}
38673867
};

include/fmt/ranges.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,8 +760,7 @@ template <typename Container> struct all {
760760
* formatted as the underlying container.
761761
*/
762762
FMT_EXPORT
763-
template <typename T>
764-
struct is_container_adaptor {
763+
template <typename T> struct is_container_adaptor {
765764
private:
766765
template <typename U> static auto check(U* p) -> typename U::container_type;
767766
template <typename> static void check(...);

0 commit comments

Comments
 (0)