diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index 4a4d5fc23..ae3e5d985 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -1326,7 +1326,7 @@ template Containers::Array inline Buffer::data() { template Containers::Array inline Buffer::subData(const GLintptr offset, const GLsizeiptr size) { Containers::Array data(size); if(size) subDataInternal(offset, size*sizeof(T), data); - return std::move(data); + return data; } #endif diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index 1a1a660a1..f714ab912 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -513,7 +513,7 @@ std::vector Context::shadingLanguageVersionStrings() const { versions.reserve(versionCount); for(GLint i = 0; i != versionCount; ++i) versions.push_back(reinterpret_cast(glGetStringi(GL_SHADING_LANGUAGE_VERSION, i))); - return std::move(versions); + return versions; #else return {shadingLanguageVersionString()}; #endif diff --git a/src/Magnum/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp index 2efbcf608..00ce14ffa 100644 --- a/src/Magnum/Text/AbstractFontConverter.cpp +++ b/src/Magnum/Text/AbstractFontConverter.cpp @@ -54,7 +54,7 @@ std::vector uniqueUnicode(const std::string& characters) std::sort(result.begin(), result.end()); result.erase(std::unique(result.begin(), result.end()), result.end()); - return std::move(result); + return result; } } @@ -81,7 +81,7 @@ std::vector>> AbstractFontConvert std::vector>> out; out.emplace_back(filename, std::move(doExportFontToSingleData(font, cache, characters))); - return std::move(out); + return out; } Containers::Array AbstractFontConverter::exportFontToSingleData(AbstractFont& font, GlyphCache& cache, const std::string& characters) const { @@ -142,7 +142,7 @@ std::vector>> AbstractFontConvert std::vector>> out; out.emplace_back(filename, std::move(doExportGlyphCacheToSingleData(cache))); - return std::move(out); + return out; } Containers::Array AbstractFontConverter::exportGlyphCacheToSingleData(GlyphCache& cache) const { diff --git a/src/Magnum/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp index 62816ed6e..8803c0731 100644 --- a/src/Magnum/Text/Renderer.cpp +++ b/src/Magnum/Text/Renderer.cpp @@ -254,7 +254,7 @@ template std::tuple Renderer: typename Shaders::AbstractVector::Position( Shaders::AbstractVector::Position::Components::Two), typename Shaders::AbstractVector::TextureCoordinates()); - return std::move(r); + return r; } #if defined(MAGNUM_TARGET_GLES2) && !defined(CORRADE_TARGET_EMSCRIPTEN) diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index 1886865bb..764e30496 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -128,7 +128,7 @@ void AbstractFontConverterTest::exportFontToSingleData() { { Containers::Array data(1); data[0] = '\xee'; - return std::move(data); + return data; } }; diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp index 43d7956ca..9e110baf0 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -111,7 +111,7 @@ std::vector>> MagnumFontConverter std::vector>> out; out.emplace_back(filename + ".conf", std::move(confData)); out.emplace_back(filename + ".tga", std::move(tgaData)); - return std::move(out); + return out; } }} diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp index 24c8b7c48..811ded4de 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp +++ b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp @@ -94,7 +94,7 @@ Containers::Array TgaImageConverter::doExportToData(const ImageReference2D } #endif - return std::move(data); + return data; } }}