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
432a54e5
Commit
432a54e5
authored
Feb 16, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some type fixes
parent
a3f52a5a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
src/json.hpp
src/json.hpp
+4
-2
src/json.hpp.re2c
src/json.hpp.re2c
+4
-2
No files found.
src/json.hpp
View file @
432a54e5
...
...
@@ -3800,7 +3800,8 @@ struct hash<nlohmann::json>
inline
size_t
operator
()(
const
nlohmann
::
json
&
j
)
const
{
// a naive hashing via the string representation
return
hash
<
nlohmann
::
json
::
string_t
>
()(
j
.
dump
());
const
auto
&
h
=
hash
<
nlohmann
::
json
::
string_t
>
();
return
h
(
j
.
dump
());
}
};
}
...
...
@@ -3815,7 +3816,8 @@ no parse error occurred.
*/
inline
nlohmann
::
json
operator
""
_json
(
const
char
*
s
,
std
::
size_t
)
{
return
nlohmann
::
json
::
parse
(
s
);
return
nlohmann
::
json
::
parse
(
reinterpret_cast
<
nlohmann
::
json
::
string_t
::
value_type
*>
(
const_cast
<
char
*>
(
s
)));
}
#endif
src/json.hpp.re2c
View file @
432a54e5
...
...
@@ -3149,7 +3149,8 @@ struct hash<nlohmann::json>
inline size_t operator()(const nlohmann::json& j) const
{
// a naive hashing via the string representation
return hash<nlohmann::json::string_t>()(j.dump());
const auto& h = hash<nlohmann::json::string_t>();
return h(j.dump());
}
};
}
...
...
@@ -3164,7 +3165,8 @@ no parse error occurred.
*/
inline nlohmann::json operator "" _json(const char* s, std::size_t)
{
return nlohmann::json::parse(s);
return nlohmann::json::parse(reinterpret_cast<nlohmann::json::string_t::value_type*>
(const_cast<char*>(s)));
}
#endif
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