fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-11-02 23:21:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Victor Zverovich
2019-07-19 10:14:32 +02:00
parent 6a497e1d06
commit 6bcc3fd216
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/scan.h
View File

@@ -167,7 +167,7 @@ struct scan_handler : error_handler {
}
void on_arg_id() { on_arg_id(next_arg_id_++); }
void on_arg_id(unsigned id) {
void on_arg_id(int id) {
if (id >= args_.size) on_error("argument index out of range");
arg_ = args_.data[id];
}

7
test/std-format-test.cc
View File

@@ -107,7 +107,8 @@ template <> struct std::formatter<S> {
// Parses a width argument id in the format { <digit> }.
constexpr auto parse(format_parse_context& ctx) {
auto iter = ctx.begin();
auto get_char = [&]() { return iter != ctx.end() ? *iter : 0; };
// auto get_char = [&]() { return iter != ctx.end() ? *iter : 0; };
auto get_char = [&]() { return iter != ctx.end() ? *iter : '\0'; };
if (get_char() != '{') return iter;
++iter;
char c = get_char();
@@ -124,7 +125,9 @@ template <> struct std::formatter<S> {
[](auto value) -> int {
if constexpr (!is_integral_v<decltype(value)>)
throw format_error("width is not integral");
else if (value < 0 || value > numeric_limits<int>::max())
// else if (value < 0 || value > numeric_limits<int>::max())
else if (fmt::internal::is_negative(value) < 0 ||
value > numeric_limits<int>::max())
throw format_error("invalid width");
else
return value;