From 00d33cd71fc98456442ca3b31d0efeccdbc0a0c8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 25 Dec 2024 12:00:22 -0500
Subject: [PATCH] Fix llsd operator
---
indra/llcommon/llsd.cpp | 2 +-
indra/llcommon/llsd.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
index 7683ac0a5fc..f422a322ecf 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 c6488efc18a..eaefa6f126d 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
--
GitLab