mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-04 14:39:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🏁 fix <optional> inclusion

Browse Source
This commit is contained in:
Niels Lohmann 2019-11-23 13:29:47 +01:00
parent df30a0ea07
commit 1359c56137
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -14,7 +14,11 @@
#include <valarray> // valarray #include <valarray> // valarray
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#include <optional> // optional #if __has_include(<optional>)
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#endif #endif
#include <nlohmann/detail/exceptions.hpp> #include <nlohmann/detail/exceptions.hpp>

6
include/nlohmann/detail/conversions/to_json.hpp
View File

@ -11,7 +11,11 @@
#include <vector> // vector #include <vector> // vector
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#include <optional> // optional #if __has_include(<optional>)
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#endif #endif
#include <nlohmann/detail/iterators/iteration_proxy.hpp> #include <nlohmann/detail/iterators/iteration_proxy.hpp>

12
single_include/nlohmann/json.hpp
View File

@ -70,7 +70,11 @@ SOFTWARE.
#include <valarray> // valarray #include <valarray> // valarray
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#include <optional> // optional #if __has_include(<optional>)
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#endif #endif
// #include <nlohmann/detail/exceptions.hpp> // #include <nlohmann/detail/exceptions.hpp>
@ -3292,7 +3296,11 @@ constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::va
#include <vector> // vector #include <vector> // vector
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#include <optional> // optional #if __has_include(<optional>)
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#endif #endif
// #include <nlohmann/detail/iterators/iteration_proxy.hpp> // #include <nlohmann/detail/iterators/iteration_proxy.hpp>