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

👌 remove unused template parameter

Browse Source
This commit is contained in:
Niels Lohmann 2021-01-26 17:49:15 +01:00
parent 74cc0ab470
commit 524eea5887
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 232 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/nlohmann/detail/exceptions.hpp
View File

@ -114,9 +114,9 @@ class exception : public std::exception
return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{}, return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
[](const std::string & a, const std::string & b) [](const std::string & a, const std::string & b)
{ {
return a + "/" + detail::escape(b); return a + "/" + detail::escape(b);
}) + ") "; }) + ") ";
#else #else
return ""; return "";
#endif #endif
@ -188,7 +188,7 @@ class parse_error : public exception
static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context) static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("parse_error", id_) + "parse error" + std::string w = exception::name("parse_error", id_) + "parse error" +
position_string(pos) + ": " + exception::diagnostics<BasicJsonType>(context) + what_arg; position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
return parse_error(id_, pos.chars_read_total, w.c_str()); return parse_error(id_, pos.chars_read_total, w.c_str());
} }
@ -197,7 +197,7 @@ class parse_error : public exception
{ {
std::string w = exception::name("parse_error", id_) + "parse error" + std::string w = exception::name("parse_error", id_) + "parse error" +
(byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
": " + exception::diagnostics<BasicJsonType>(context) + what_arg; ": " + exception::diagnostics(context) + what_arg;
return parse_error(id_, byte_, w.c_str()); return parse_error(id_, byte_, w.c_str());
} }
@ -321,7 +321,7 @@ class type_error : public exception
template<typename BasicJsonType> template<typename BasicJsonType>
static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context) static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("type_error", id_) + exception::diagnostics<BasicJsonType>(context) + what_arg; std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
return type_error(id_, w.c_str()); return type_error(id_, w.c_str());
} }
@ -369,7 +369,7 @@ class out_of_range : public exception
template<typename BasicJsonType> template<typename BasicJsonType>
static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context) static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("out_of_range", id_) + exception::diagnostics<BasicJsonType>(context) + what_arg; std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
return out_of_range(id_, w.c_str()); return out_of_range(id_, w.c_str());
} }
@ -408,7 +408,7 @@ class other_error : public exception
template<typename BasicJsonType> template<typename BasicJsonType>
static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context) static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
{ {
std::string w = exception::name("other_error", id_) + exception::diagnostics<BasicJsonType>(context) + what_arg; std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
return other_error(id_, w.c_str()); return other_error(id_, w.c_str());
} }

520
single_include/nlohmann/json.hpp
View File

File diff suppressed because it is too large Load Diff