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

Remove unnecessary call to std::tie (fixes compilation error on MSVC 2017) (#137)

Browse Source 
* replace std::tie with simple tuple

The call to std::tie was causing a compiler error on MSVC 2017.
This commit is contained in:
Michael Jabbour 2020-11-26 11:30:14 +02:00 committed by GitHub
parent 1519c845c2
commit 5302adfdc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,10 +59,9 @@ 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 std::tie(urn_, scheme_, authority_, path_, return {urn_, scheme_, authority_, path_, identifier_ != "" ? identifier_ : pointer_};
identifier_ != "" ? identifier_ : pointer_);
} }
public: public:
@ -115,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);