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
c790b9f8
Unverified
Commit
c790b9f8
authored
6 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed regression #1530
parent
483a0865
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+3
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-1
No files found.
include/nlohmann/json.hpp
View file @
c790b9f8
...
...
@@ -5728,7 +5728,9 @@ class basic_json
switch
(
lhs_type
)
{
case
value_t
:
:
array
:
return
*
lhs
.
m_value
.
array
<
*
rhs
.
m_value
.
array
;
// note parentheses are necessary, see
// https://github.com/nlohmann/json/issues/1530
return
(
*
lhs
.
m_value
.
array
<
*
rhs
.
m_value
.
array
);
case
value_t
:
:
object
:
return
*
lhs
.
m_value
.
object
<
*
rhs
.
m_value
.
object
;
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
c790b9f8
...
...
@@ -18493,7 +18493,9 @@ class basic_json
switch (lhs_type)
{
case value_t::array:
return *lhs.m_value.array < *rhs.m_value.array;
// note parentheses are necessary, see
// https://github.com/nlohmann/json/issues/1530
return (*lhs.m_value.array < *rhs.m_value.array);
case value_t::object:
return *lhs.m_value.object < *rhs.m_value.object;
...
...
This diff is collapsed.
Click to expand it.
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