🚨 fix warning

nlohmann · Mar 15, 2024 · cc4d7f1 · cc4d7f1
1 parent 7b89d3a
commit cc4d7f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
@@ -1213,11 +1213,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
     /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(basic_json&& other) noexcept
         : json_base_class_t(std::forward<json_base_class_t>(other)),
-          m_data(std::move(other.m_data))
+          // check that passed value is valid (has to be done before moving)
+          m_data(std::move((other.assert_invariant(false), other.m_data)))
     {
-        // check that passed value is valid
-        other.assert_invariant(false);
-
         // invalidate payload
         other.m_data.m_type = value_t::null;
         other.m_data.m_value = {};

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -20516,11 +20516,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
     /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(basic_json&& other) noexcept
         : json_base_class_t(std::forward<json_base_class_t>(other)),
-          m_data(std::move(other.m_data))
+          // check that passed value is valid (has to be done before moving)
+          m_data(std::move((other.assert_invariant(false), other.m_data)))
     {
-        // check that passed value is valid
-        other.assert_invariant(false);
-
         // invalidate payload
         other.m_data.m_type = value_t::null;
         other.m_data.m_value = {};