diff options
| author |  Sadie Powell | 2025-03-01 16:24:05 +0000 |
|---|---|---|
| committer | Sadie Powell | 2025-03-01 16:26:53 +0000 |
| commit | a27defd72f82627993a059683c8399beb477a800 (patch) | |
| tree | a926b5cab8249832c7d147c508f7f098cc763ff7 /src/configparser.cpp | |
| parent | Replace insp::substring_view with the C++20 iterator constructor. (diff) | |
| parent | Avoid the use of ConvToStr in string concatenation. (diff) | |
Merge branch 'insp4' into master.
Diffstat (limited to 'src/configparser.cpp')
| -rw-r--r-- | src/configparser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/configparser.cpp b/src/configparser.cpp index f32165df9..7476fc061 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -348,7 +348,7 @@ FilePosition::FilePosition(const std::string& Name, unsigned long Line, unsigned std::string FilePosition::str() const { - return name + ":" + ConvToStr(line) + ":" + ConvToStr(column); + return FMT::format("{}:{}:{}", name, line, column); } void ParseStack::DoInclude(const std::shared_ptr<ConfigTag>& tag, int flags) @@ -588,7 +588,7 @@ std::string ConfigTag::getString(const std::string& key, const std::string& def, if (res.length() < minlen || res.length() > maxlen) { - LogMalformed(key, res, def, "not between " + ConvToStr(minlen) + " and " + ConvToStr(maxlen) + " characters in length"); + LogMalformed(key, res, def, FMT::format("not between {} and {} characters in length", minlen, maxlen)); return def; } return res; @@ -629,7 +629,7 @@ namespace default: num = def; - tag->LogMalformed(key, val, ConvToStr(def), "contains an invalid magnitude specifier (" + ConvToStr(*tail) +")"); + tag->LogMalformed(key, val, ConvToStr(def), FMT::format("contains an invalid magnitude specifier ({})", *tail)); return; } } @@ -649,7 +649,7 @@ namespace if (num >= min && num <= max) return; - tag->LogMalformed(key, ConvToStr(num), ConvToStr(def), "not between " + ConvToStr(min) + " and " + ConvToStr(max)); + tag->LogMalformed(key, ConvToStr(num), ConvToStr(def), FMT::format("not between {} and {}", min, max)); num = def; } } |