🏁 fix for #1168

04372a8c · Niels Lohmann · 7bfc406d · 04372a8c · 04372a8c
Unverified Commit 04372a8c authored Jul 19, 2018 by Niels Lohmann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 10 deletions

include/nlohmann/json.hpp include/nlohmann/json.hpp +4 -5

single_include/nlohmann/json.hpp single_include/nlohmann/json.hpp +4 -5

No files found.
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -7637,11 +7637,10 @@ namespace std
 @since version 1.0.0
 */
 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);
 }

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -18472,11 +18472,10 @@ namespace std
 @since version 1.0.0
 */
 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);
 }