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
ddda67a0
Commit
ddda67a0
authored
Oct 30, 2019
by
Anthony Van Herrewege
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't capture json input by value (fixed #1822).
parent
fb9a2643
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
48 deletions
+48
-48
include/nlohmann/detail/macro_scope.hpp
include/nlohmann/detail/macro_scope.hpp
+24
-24
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+24
-24
No files found.
include/nlohmann/detail/macro_scope.hpp
View file @
ddda67a0
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!"); \
static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!"); \
static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__; \
static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__; \
auto it = std::find_if(std::begin(m), std::end(m), \
auto it = std::find_if(std::begin(m), std::end(m), \
[j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
[
&
j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
{ \
{ \
return ej_pair.second == j; \
return ej_pair.second == j; \
}); \
}); \
...
...
single_include/nlohmann/json.hpp
View file @
ddda67a0
...
@@ -1801,7 +1801,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
...
@@ -1801,7 +1801,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!"); \
static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!"); \
static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__; \
static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__; \
auto it = std::find_if(std::begin(m), std::end(m), \
auto it = std::find_if(std::begin(m), std::end(m), \
[j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
[
&
j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
{ \
{ \
return ej_pair.second == j; \
return ej_pair.second == j; \
}); \
}); \
...
...
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