no pessimizing move

spring · May 10, 2020 · ba93bc9 · ba93bc9
1 parent bdaa8d7
commit ba93bc9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/rts/Game/ClientData.cpp b/rts/Game/ClientData.cpp
@@ -37,6 +37,6 @@ std::string ClientData::GetUncompressed(const std::vector<std::uint8_t>& compres
 	std::vector<std::uint8_t> buffer{zlib::inflate(compressed)};
 	std::string cdata{buffer.begin(), buffer.end()};
 
-	return (std::move(cdata));
+	return cdata;
 }
 
diff --git a/rts/Rendering/Shaders/Shader.cpp b/rts/Rendering/Shaders/Shader.cpp
@@ -115,7 +115,7 @@ std::string Shader::GetShaderVersionDirective(std::string& srcText)
 		srcText.erase(pos, eol - pos);
 	}
 
-	return (std::move(version));
+	return version;
 }
 
 /*****************************************************************/
@@ -548,7 +548,7 @@ namespace Shader {
 			programLog.append(shaderLog);
 		}
 
-		return (std::move(cso));
+		return cso;
 	}
 }
 
diff --git a/rts/System/EventHandler.cpp b/rts/System/EventHandler.cpp
@@ -681,7 +681,7 @@ template<typename T, typename F, typename... A> 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
@@ -259,7 +259,7 @@ std::vector<std::uint8_t> zlib::deflate(const std::uint8_t* inflData, unsigned l
 		deflData.clear();
 	}
 
-	return (std::move(deflData));
+	return deflData;
 }
 
 std::vector<std::uint8_t> zlib::inflate(const std::vector<std::uint8_t>& deflData) { return (zlib::inflate(deflData.data(), deflData.size())); }
@@ -286,6 +286,6 @@ std::vector<std::uint8_t> zlib::inflate(const std::uint8_t* deflData, unsigned l
 	inflData.resize(rawSize);
 	inflData.shrink_to_fit();
 
-	return (std::move(inflData));
+	return inflData;
 }
 #endif //UNITSYNC