mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-06-27 04:21:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Include <string_view> in "nlohmann/json.hpp" when C++17 is used

Browse Source
This commit is contained in:
Alexander Karzhenkov 2020-12-20 19:40:36 +05:00
parent 39b8d6bd33
commit cd7acc1dc5
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/json.hpp
View File

@ -73,6 +73,10 @@ SOFTWARE.
#include <nlohmann/json_fwd.hpp> #include <nlohmann/json_fwd.hpp>
#include <nlohmann/ordered_map.hpp> #include <nlohmann/ordered_map.hpp>
#if defined(JSON_HAS_CPP_17)
#include <string_view>
#endif
/*! /*!
@brief namespace for Niels Lohmann @brief namespace for Niels Lohmann
@see https://github.com/nlohmann @see https://github.com/nlohmann

4
single_include/nlohmann/json.hpp
View File

@ -16663,6 +16663,10 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
} // namespace nlohmann } // namespace nlohmann
#if defined(JSON_HAS_CPP_17)
#include <string_view>
#endif
/*! /*!
@brief namespace for Niels Lohmann @brief namespace for Niels Lohmann
@see https://github.com/nlohmann @see https://github.com/nlohmann

4
test/src/unit-conversions.cpp
View File

@ -48,10 +48,6 @@ using nlohmann::json;
#define JSON_HAS_CPP_14 #define JSON_HAS_CPP_14
#endif #endif
#if defined(JSON_HAS_CPP_17)
#include <string_view>
#endif
TEST_CASE("value conversion") TEST_CASE("value conversion")
{ {
SECTION("get an object (explicit)") SECTION("get an object (explicit)")