j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🏁 fix for #1168

Browse source
This commit is contained in:
Niels Lohmann 2018-07-19 17:31:50 +02:00
parent 7bfc406ded
commit 04372a8c56
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/nlohmann/json.hpp
View file

@ -7637,11 +7637,10 @@ namespace std
@since version 1.0.0 @since version 1.0.0
*/ */
template<> template<>
inline void swap(nlohmann::json& j1, inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
nlohmann::json& j2) noexcept( is_nothrow_move_constructible<nlohmann::json>::value and
is_nothrow_move_constructible<nlohmann::json>::value and is_nothrow_move_assignable<nlohmann::json>::value
is_nothrow_move_assignable<nlohmann::json>::value )
)
{ {
j1.swap(j2); j1.swap(j2);
} }

9
single_include/nlohmann/json.hpp
View file

@ -18472,11 +18472,10 @@ namespace std
@since version 1.0.0 @since version 1.0.0
*/ */
template<> template<>
inline void swap(nlohmann::json& j1, inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
nlohmann::json& j2) noexcept( is_nothrow_move_constructible<nlohmann::json>::value and
is_nothrow_move_constructible<nlohmann::json>::value and is_nothrow_move_assignable<nlohmann::json>::value
is_nothrow_move_assignable<nlohmann::json>::value )
)
{ {
j1.swap(j2); j1.swap(j2);
} }