Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
cd7acc1d
Commit
cd7acc1d
authored
Dec 20, 2020
by
Alexander Karzhenkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include <string_view> in "nlohmann/json.hpp" when C++17 is used
parent
39b8d6bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+4
-0
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+4
-0
test/src/unit-conversions.cpp
test/src/unit-conversions.cpp
+0
-4
No files found.
include/nlohmann/json.hpp
View file @
cd7acc1d
...
@@ -73,6 +73,10 @@ SOFTWARE.
...
@@ -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
...
...
single_include/nlohmann/json.hpp
View file @
cd7acc1d
...
@@ -16663,6 +16663,10 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
...
@@ -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
...
...
test/src/unit-conversions.cpp
View file @
cd7acc1d
...
@@ -48,10 +48,6 @@ using nlohmann::json;
...
@@ -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)"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment