diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp index 7683ac0a5fc5527869b8717d77ac396c1df999a9..f422a322ecf2f8faffdda5863d8e65f61722e5fa 100644 --- a/indra/llcommon/llsd.cpp +++ b/indra/llcommon/llsd.cpp @@ -870,7 +870,7 @@ void LLSD::assign(const LLSD& other) { Impl::assign(impl, other.impl); } LLSD::LLSD(LLSD&& other) noexcept : impl(nullptr) { ALLOC_LLSD_OBJECT; Impl::move(impl, other.impl); } void LLSD::assign(LLSD&& other) { Impl::move(impl, other.impl); } -LLSD& LLSD::operator=(LLSD&& other) noexcept { Impl::move(impl, other.impl); return *this; } +LLSD& LLSD::operator=(LLSD&& other) { Impl::move(impl, other.impl); return *this; } void LLSD::clear() { Impl::assignUndefined(impl); } diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h index c6488efc18a320c19efd90bafe91c0f47bd0de5f..eaefa6f126d3a9c7e83a52446472fe331882cf69 100644 --- a/indra/llcommon/llsd.h +++ b/indra/llcommon/llsd.h @@ -168,7 +168,7 @@ class LL_COMMON_API LLSD final //@{ LLSD(LLSD&& other) noexcept; void assign(LLSD&& other); - LLSD& operator=(LLSD&& other) noexcept; + LLSD& operator=(LLSD&& other); //@} void clear(); ///< resets to Undefined