minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Now duct tape json together for CXX 17

This commit is contained in:
jordan4ibanez 2023-11-29 05:52:51 -05:00
parent d9082b47f1
commit ab0d5b0c89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Irrlicht/tinygltf/json.hpp
View File

@ -4381,7 +4381,7 @@ void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyE
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
template<typename BasicJsonType> 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())) 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 #ifdef JSON_HAS_CPP_17
#include <filesystem> #include <experimental/filesystem>
#endif #endif
namespace nlohmann namespace nlohmann
@ -5004,7 +5004,7 @@ void to_json(BasicJsonType& j, const T& t)
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
template<typename BasicJsonType> 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(); j = p.string();
} }