mirror of https://github.com/minetest/irrlicht.git
Now duct tape json together for CXX 17
This commit is contained in:
parent
d9082b47f1
commit
ab0d5b0c89
|
@ -4381,7 +4381,7 @@ void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyE
|
|||
|
||||
#ifdef JSON_HAS_CPP_17
|
||||
template<typename BasicJsonType>
|
||||
void from_json(const BasicJsonType& j, std::filesystem::path& p)
|
||||
void from_json(const BasicJsonType& j, std::experimental::filesystem::path& p)
|
||||
{
|
||||
if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
|
||||
{
|
||||
|
@ -4627,7 +4627,7 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
|
|||
|
||||
|
||||
#ifdef JSON_HAS_CPP_17
|
||||
#include <filesystem>
|
||||
#include <experimental/filesystem>
|
||||
#endif
|
||||
|
||||
namespace nlohmann
|
||||
|
@ -5004,7 +5004,7 @@ void to_json(BasicJsonType& j, const T& t)
|
|||
|
||||
#ifdef JSON_HAS_CPP_17
|
||||
template<typename BasicJsonType>
|
||||
void to_json(BasicJsonType& j, const std::filesystem::path& p)
|
||||
void to_json(BasicJsonType& j, const std::experimental::filesystem::path& p)
|
||||
{
|
||||
j = p.string();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue