From dceb9b2493aaccb1f64253c40e3d893c3a75f7c4 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 3 Nov 2021 22:00:39 +0100 Subject: [PATCH] :recycle: overwork std specializations --- include/nlohmann/json.hpp | 10 +++++----- single_include/nlohmann/json.hpp | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 50829e0a4..5ca0ebfe0 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -4748,12 +4748,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& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name) - is_nothrow_move_constructible::value&& // NOLINT(misc-redundant-expression) - is_nothrow_move_assignable::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::value&& // NOLINT(misc-redundant-expression) + is_nothrow_move_assignable::value) { j1.swap(j2); } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 048287937..3d845c924 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -22251,10 +22251,10 @@ struct less< ::nlohmann::detail::value_t> @since version 1.0.0 */ -template<> -inline void swap(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name) - is_nothrow_move_constructible::value&& // NOLINT(misc-redundant-expression) - is_nothrow_move_assignable::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::value&& // NOLINT(misc-redundant-expression) + is_nothrow_move_assignable::value) { j1.swap(j2); }