From 135b32a765ed3795857ac00355ecf49759414138 Mon Sep 17 00:00:00 2001 From: Ryo Suzuki Date: Sat, 30 Dec 2023 09:22:09 +0900 Subject: [PATCH] =?UTF-8?q?JSON::JSON(JSON&&)=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Siv3D/include/Siv3D/JSON.hpp | 2 +- Siv3D/src/Siv3D/JSON/SivJSON.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Siv3D/include/Siv3D/JSON.hpp b/Siv3D/include/Siv3D/JSON.hpp index 7572eedd3..d1a0a0dcd 100644 --- a/Siv3D/include/Siv3D/JSON.hpp +++ b/Siv3D/include/Siv3D/JSON.hpp @@ -251,7 +251,7 @@ namespace s3d JSON(const JSON& other); SIV3D_NODISCARD_CXX20 - JSON(JSON&& other) noexcept; + JSON(JSON&& other); SIV3D_NODISCARD_CXX20 JSON(const std::initializer_list>& list); diff --git a/Siv3D/src/Siv3D/JSON/SivJSON.cpp b/Siv3D/src/Siv3D/JSON/SivJSON.cpp index af8174e40..51c814b88 100644 --- a/Siv3D/src/Siv3D/JSON/SivJSON.cpp +++ b/Siv3D/src/Siv3D/JSON/SivJSON.cpp @@ -496,7 +496,7 @@ namespace s3d : m_detail{ std::make_shared(*other.m_detail) } , m_isValid{ other.m_isValid } {} - JSON::JSON(JSON&& other) noexcept + JSON::JSON(JSON&& other) : m_detail{ std::exchange(other.m_detail, std::make_shared()) } , m_isValid{ std::exchange(other.m_isValid, false) } {}