fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-11-30 06:09:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

🎨 🐛 Rename all shadowed types and variables

Browse Source
This commit is contained in:
Jonathan Gopel
2020-10-27 21:55:44 -06:00
committed by Victor Zverovich
parent 771292c328
commit e904e891bd
7 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/fmt/compile.h
View File

@@ -175,9 +175,9 @@ class format_string_compiler : public error_handler {
repl.arg_id = part_.part_kind == part::kind::arg_index
? arg_ref<Char>(part_.val.arg_index)
: arg_ref<Char>(part_.val.str);
auto part = part::make_replacement(repl);
part.arg_id_end = begin;
handler_(part);
auto replacement_part = part::make_replacement(repl);
replacement_part.arg_id_end = begin;
handler_(replacement_part);
return it;
}
};
@@ -530,14 +530,14 @@ constexpr auto compile_format_string(S format_str) {
if constexpr (str[POS + 1] == '{') {
return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
} else if constexpr (str[POS + 1] == '}') {
using type = get_type<ID, Args>;
return parse_tail<Args, POS + 2, ID + 1>(field<char_type, type, ID>(),
using id_type = get_type<ID, Args>;
return parse_tail<Args, POS + 2, ID + 1>(field<char_type, id_type, ID>(),
format_str);
} else if constexpr (str[POS + 1] == ':') {
using type = get_type<ID, Args>;
constexpr auto result = parse_specs<type>(str, POS + 2, ID);
using id_type = get_type<ID, Args>;
constexpr auto result = parse_specs<id_type>(str, POS + 2, ID);
return parse_tail<Args, result.end, result.next_arg_id>(
spec_field<char_type, type, ID>{result.fmt}, format_str);
spec_field<char_type, id_type, ID>{result.fmt}, format_str);
} else {
return unknown_format();
}

4
include/fmt/os.h
View File

@@ -363,8 +363,8 @@ struct ostream_params {
ostream_params() {}
template <typename... T>
ostream_params(T... params, int oflag) : ostream_params(params...) {
this->oflag = oflag;
ostream_params(T... params, int new_oflag) : ostream_params(params...) {
oflag = new_oflag;
}
template <typename... T>