From e9597711df29ead72e599c5d16f183580ffec160 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 16 Jul 2021 22:35:33 -0400
Subject: [PATCH] Fix build warnings
---
indra/llcommon/llsd.cpp | 6 +++---
indra/llcommon/llsdutil.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
index ca4fe23d516..ccb676edca4 100644
--- a/indra/llcommon/llsd.cpp
+++ b/indra/llcommon/llsd.cpp
@@ -195,7 +195,7 @@ namespace
LLSD::Type type() const override { return T; }
using LLSD::Impl::assign; // Unhiding base class virtuals...
- virtual void assign(LLSD::Impl*& var, Data value)
+ void assign(LLSD::Impl*& var, Data value) override
{
if (shared())
{
@@ -900,8 +900,8 @@ const LLSD::String& LLSD::asStringRef() const { return safe(impl).asStringRef();
LLSD::LLSD(const char* v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
void LLSD::assign(const char* v)
{
- if(v) assign(std::move(std::string(v)));
- else assign(std::move(std::string()));
+ if(v) assign(std::string(v));
+ else assign(std::string());
}
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 04f23f921e0..441d508d065 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -968,7 +968,7 @@ LLSD llsd_clone(LLSD value, LLSD filter)
case LLSD::TypeBinary:
{
LLSD::Binary bin(value.asBinary().begin(), value.asBinary().end());
- clone = std::move(LLSD::Binary(std::move(bin)));
+ clone = LLSD::Binary(std::move(bin));
break;
}
default:
--
GitLab