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
5c08a52f
Unverified
Commit
5c08a52f
authored
Nov 04, 2021
by
Niels Lohmann
Committed by
GitHub
Nov 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
♻
overwork std specializations (#3121)
parent
5d87c4d4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
27 deletions
+73
-27
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+11
-13
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+11
-13
test/src/unit-hash.cpp
test/src/unit-hash.cpp
+51
-1
No files found.
include/nlohmann/json.hpp
View file @
5c08a52f
...
...
@@ -8936,20 +8936,19 @@ std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
// nonmember support //
///////////////////////
// specialization of std::swap, and std::hash
namespace
std
namespace
std
// NOLINT(cert-dcl58-cpp)
{
/// hash value for JSON objects
template
<
>
struct
hash
<
nlohmann
::
json
>
NLOHMANN_BASIC_JSON_TPL_DECLARATION
struct
hash
<
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
>
{
/*!
@brief return a hash value for a JSON object
@since version 1.0.0
@since version 1.0.0
, extended for arbitrary basic_json types in 3.10.5.
*/
std
::
size_t
operator
()(
const
nlohmann
::
json
&
j
)
const
std
::
size_t
operator
()(
const
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
&
j
)
const
{
return
nlohmann
::
detail
::
hash
(
j
);
}
...
...
@@ -8959,7 +8958,7 @@ struct hash<nlohmann::json>
/// @note: do not remove the space after '<',
/// see https://github.com/nlohmann/json/pull/679
template
<
>
struct
less
<::
nlohmann
::
detail
::
value_t
>
struct
less
<
::
nlohmann
::
detail
::
value_t
>
{
/*!
@brief compare two value_t enum values
...
...
@@ -8978,13 +8977,12 @@ struct less<::nlohmann::detail::value_t>
/*!
@brief exchanges the values of two JSON objects
@since version 1.0.0
@since version 1.0.0
, extended for arbitrary basic_json types in 3.10.5.
*/
template
<
>
inline
void
swap
<
nlohmann
::
json
>
(
nlohmann
::
json
&
j1
,
nlohmann
::
json
&
j2
)
noexcept
(
// NOLINT(readability-inconsistent-declaration-parameter-name)
is_nothrow_move_constructible
<
nlohmann
::
json
>::
value
&&
// NOLINT(misc-redundant-expression)
is_nothrow_move_assignable
<
nlohmann
::
json
>::
value
)
NLOHMANN_BASIC_JSON_TPL_DECLARATION
inline
void
swap
(
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
&
j1
,
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
&
j2
)
noexcept
(
// NOLINT(readability-inconsistent-declaration-parameter-name)
is_nothrow_move_constructible
<
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
>::
value
&&
// NOLINT(misc-redundant-expression)
is_nothrow_move_assignable
<
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
>::
value
)
{
j1
.
swap
(
j2
);
}
...
...
single_include/nlohmann/json.hpp
View file @
5c08a52f
...
...
@@ -26437,20 +26437,19 @@ std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
// nonmember support //
///////////////////////
// specialization of std::swap, and std::hash
namespace
std
namespace
std
// NOLINT(cert-dcl58-cpp)
{
/// hash value for JSON objects
template
<
>
struct
hash
<
nlohmann
::
json
>
NLOHMANN_BASIC_JSON_TPL_DECLARATION
struct
hash
<
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
>
{
/*!
@brief return a hash value for a JSON object
@since version 1.0.0
@since version 1.0.0
, extended for arbitrary basic_json types in 3.10.5.
*/
std
::
size_t
operator
()(
const
nlohmann
::
json
&
j
)
const
std
::
size_t
operator
()(
const
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
&
j
)
const
{
return
nlohmann
::
detail
::
hash
(
j
);
}
...
...
@@ -26460,7 +26459,7 @@ struct hash<nlohmann::json>
/// @note: do not remove the space after '<',
/// see https://github.com/nlohmann/json/pull/679
template
<
>
struct
less
<::
nlohmann
::
detail
::
value_t
>
struct
less
<
::
nlohmann
::
detail
::
value_t
>
{
/*!
@brief compare two value_t enum values
...
...
@@ -26479,13 +26478,12 @@ struct less<::nlohmann::detail::value_t>
/*!
@brief exchanges the values of two JSON objects
@since version 1.0.0
@since version 1.0.0
, extended for arbitrary basic_json types in 3.10.5.
*/
template
<
>
inline
void
swap
<
nlohmann
::
json
>
(
nlohmann
::
json
&
j1
,
nlohmann
::
json
&
j2
)
noexcept
(
// NOLINT(readability-inconsistent-declaration-parameter-name)
is_nothrow_move_constructible
<
nlohmann
::
json
>::
value
&&
// NOLINT(misc-redundant-expression)
is_nothrow_move_assignable
<
nlohmann
::
json
>::
value
)
NLOHMANN_BASIC_JSON_TPL_DECLARATION
inline
void
swap
(
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
&
j1
,
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
&
j2
)
noexcept
(
// NOLINT(readability-inconsistent-declaration-parameter-name)
is_nothrow_move_constructible
<
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
>::
value
&&
// NOLINT(misc-redundant-expression)
is_nothrow_move_assignable
<
nlohmann
::
NLOHMANN_BASIC_JSON_TPL
>::
value
)
{
j1
.
swap
(
j2
);
}
...
...
test/src/unit-hash.cpp
View file @
5c08a52f
...
...
@@ -31,10 +31,11 @@ SOFTWARE.
#include <nlohmann/json.hpp>
using
json
=
nlohmann
::
json
;
using
ordered_json
=
nlohmann
::
ordered_json
;
#include <set>
TEST_CASE
(
"hash"
)
TEST_CASE
(
"hash
<nlohmann::json>
"
)
{
// Collect hashes for different JSON values and make sure that they are distinct
// We cannot compare against fixed values, because the implementation of
...
...
@@ -82,3 +83,52 @@ TEST_CASE("hash")
CHECK
(
hashes
.
size
()
==
21
);
}
TEST_CASE
(
"hash<nlohmann::ordered_json>"
)
{
// Collect hashes for different JSON values and make sure that they are distinct
// We cannot compare against fixed values, because the implementation of
// std::hash may differ between compilers.
std
::
set
<
std
::
size_t
>
hashes
;
// null
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
nullptr
)));
// boolean
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
true
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
false
)));
// string
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
""
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
"foo"
)));
// number
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
0
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
unsigned
(
0
))));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
-
1
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
0.0
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
42.23
)));
// array
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
array
()));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
array
({
1
,
2
,
3
})));
// object
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
object
()));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
object
({{
"foo"
,
"bar"
}})));
// binary
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
binary
({})));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
binary
({},
0
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
binary
({},
42
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
binary
({
1
,
2
,
3
})));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
binary
({
1
,
2
,
3
},
0
)));
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
::
binary
({
1
,
2
,
3
},
42
)));
// discarded
hashes
.
insert
(
std
::
hash
<
ordered_json
>
{}(
ordered_json
(
ordered_json
::
value_t
::
discarded
)));
CHECK
(
hashes
.
size
()
==
21
);
}
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