j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some type fixes

Browse source
This commit is contained in:
Niels 2015-02-16 23:17:28 +01:00
parent a3f52a5a04
commit 432a54e570
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/json.hpp
View file

@ -3800,7 +3800,8 @@ struct hash<nlohmann::json>
inline size_t operator()(const nlohmann::json& j) const inline size_t operator()(const nlohmann::json& j) const
{ {
// a naive hashing via the string representation // a naive hashing via the string representation
return hash<nlohmann::json::string_t>()(j.dump()); const auto& h = hash<nlohmann::json::string_t>();
return h(j.dump());
} }
}; };
} }
@ -3815,7 +3816,8 @@ no parse error occurred.
*/ */
inline nlohmann::json operator "" _json(const char* s, std::size_t) inline nlohmann::json operator "" _json(const char* s, std::size_t)
{ {
return nlohmann::json::parse(s); return nlohmann::json::parse(reinterpret_cast<nlohmann::json::string_t::value_type*>
(const_cast<char*>(s)));
} }
#endif #endif

6
src/json.hpp.re2c
View file

@ -3149,7 +3149,8 @@ struct hash<nlohmann::json>
inline size_t operator()(const nlohmann::json& j) const inline size_t operator()(const nlohmann::json& j) const
{ {
// a naive hashing via the string representation // a naive hashing via the string representation
return hash<nlohmann::json::string_t>()(j.dump()); const auto& h = hash<nlohmann::json::string_t>();
return h(j.dump());
} }
}; };
} }
@ -3164,7 +3165,8 @@ no parse error occurred.
*/ */
inline nlohmann::json operator "" _json(const char* s, std::size_t) inline nlohmann::json operator "" _json(const char* s, std::size_t)
{ {
return nlohmann::json::parse(s); return nlohmann::json::parse(reinterpret_cast<nlohmann::json::string_t::value_type*>
(const_cast<char*>(s)));
} }
#endif #endif