From b81988f76132448e4ef55a4f2aac2872da387dff Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Sun, 10 May 2020 14:40:37 +0900 Subject: [PATCH] no pessimizing move --- rts/Game/ClientData.cpp | 2 +- rts/System/EventHandler.cpp | 2 +- rts/System/StringUtil.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rts/Game/ClientData.cpp b/rts/Game/ClientData.cpp index 8483bbb4758..19020f716ef 100644 --- a/rts/Game/ClientData.cpp +++ b/rts/Game/ClientData.cpp @@ -37,6 +37,6 @@ std::string ClientData::GetUncompressed(const std::vector& compres std::vector buffer{zlib::inflate(compressed)}; std::string cdata{buffer.begin(), buffer.end()}; - return (std::move(cdata)); + return cdata; } diff --git a/rts/System/EventHandler.cpp b/rts/System/EventHandler.cpp index 9d13af86068..946632e46e6 100644 --- a/rts/System/EventHandler.cpp +++ b/rts/System/EventHandler.cpp @@ -676,7 +676,7 @@ template std::string ControlReverseIterat if (str.empty()) continue; - return (std::move(str)); + return str; } return {}; diff --git a/rts/System/StringUtil.cpp b/rts/System/StringUtil.cpp index f46815bbb8e..0a2ea0d2f2d 100644 --- a/rts/System/StringUtil.cpp +++ b/rts/System/StringUtil.cpp @@ -259,7 +259,7 @@ std::vector zlib::deflate(const std::uint8_t* inflData, unsigned l deflData.clear(); } - return (std::move(deflData)); + return deflData; } std::vector zlib::inflate(const std::vector& deflData) { return (zlib::inflate(deflData.data(), deflData.size())); } @@ -286,6 +286,6 @@ std::vector zlib::inflate(const std::uint8_t* deflData, unsigned l inflData.resize(rawSize); inflData.shrink_to_fit(); - return (std::move(inflData)); + return inflData; } #endif //UNITSYNC