luo980/json-schema-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename json_uri::tie() to as_tuple()

Browse Source
This commit is contained in:
Michael Jabbour 2020-11-23 09:07:11 +02:00
parent 1b0782458c
commit 11ff06521d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nlohmann/json-schema.hpp
View File

@ -59,7 +59,7 @@ protected:
// decodes a JSON uri and replaces all or part of the currently stored values // decodes a JSON uri and replaces all or part of the currently stored values
void update(const std::string &uri); void update(const std::string &uri);
std::tuple<std::string, std::string, std::string, std::string, std::string> tie() const std::tuple<std::string, std::string, std::string, std::string, std::string> as_tuple() const
{ {
return {urn_, scheme_, authority_, path_, identifier_ != "" ? identifier_ : pointer_}; return {urn_, scheme_, authority_, path_, identifier_ != "" ? identifier_ : pointer_};
} }
@ -114,12 +114,12 @@ public:
friend bool operator<(const json_uri &l, const json_uri &r) friend bool operator<(const json_uri &l, const json_uri &r)
{ {
return l.tie() < r.tie(); return l.as_tuple() < r.as_tuple();
} }
friend bool operator==(const json_uri &l, const json_uri &r) friend bool operator==(const json_uri &l, const json_uri &r)
{ {
return l.tie() == r.tie(); return l.as_tuple() == r.as_tuple();
} }
friend std::ostream &operator<<(std::ostream &os, const json_uri &u); friend std::ostream &operator<<(std::ostream &os, const json_uri &u);