Browse Source

Don't use `return std::move()` where it is not needed.

pull/94/head
Vladimír Vondruš 11 years ago
parent
commit
70150a8845
  1. 2
      src/Magnum/Buffer.h
  2. 2
      src/Magnum/Context.cpp
  3. 6
      src/Magnum/Text/AbstractFontConverter.cpp
  4. 2
      src/Magnum/Text/Renderer.cpp
  5. 2
      src/Magnum/Text/Test/AbstractFontConverterTest.cpp
  6. 2
      src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp
  7. 2
      src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

2
src/Magnum/Buffer.h

@ -1326,7 +1326,7 @@ template<class T> Containers::Array<T> inline Buffer::data() {
template<class T> Containers::Array<T> inline Buffer::subData(const GLintptr offset, const GLsizeiptr size) {
Containers::Array<T> data(size);
if(size) subDataInternal(offset, size*sizeof(T), data);
return std::move(data);
return data;
}
#endif

2
src/Magnum/Context.cpp

@ -513,7 +513,7 @@ std::vector<std::string> Context::shadingLanguageVersionStrings() const {
versions.reserve(versionCount);
for(GLint i = 0; i != versionCount; ++i)
versions.push_back(reinterpret_cast<const char*>(glGetStringi(GL_SHADING_LANGUAGE_VERSION, i)));
return std::move(versions);
return versions;
#else
return {shadingLanguageVersionString()};
#endif

6
src/Magnum/Text/AbstractFontConverter.cpp

@ -54,7 +54,7 @@ std::vector<char32_t> 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<std::pair<std::string, Containers::Array<char>>> AbstractFontConvert
std::vector<std::pair<std::string, Containers::Array<char>>> out;
out.emplace_back(filename, std::move(doExportFontToSingleData(font, cache, characters)));
return std::move(out);
return out;
}
Containers::Array<char> AbstractFontConverter::exportFontToSingleData(AbstractFont& font, GlyphCache& cache, const std::string& characters) const {
@ -142,7 +142,7 @@ std::vector<std::pair<std::string, Containers::Array<char>>> AbstractFontConvert
std::vector<std::pair<std::string, Containers::Array<char>>> out;
out.emplace_back(filename, std::move(doExportGlyphCacheToSingleData(cache)));
return std::move(out);
return out;
}
Containers::Array<char> AbstractFontConverter::exportGlyphCacheToSingleData(GlyphCache& cache) const {

2
src/Magnum/Text/Renderer.cpp

@ -254,7 +254,7 @@ template<UnsignedInt dimensions> std::tuple<Mesh, Range2D> Renderer<dimensions>:
typename Shaders::AbstractVector<dimensions>::Position(
Shaders::AbstractVector<dimensions>::Position::Components::Two),
typename Shaders::AbstractVector<dimensions>::TextureCoordinates());
return std::move(r);
return r;
}
#if defined(MAGNUM_TARGET_GLES2) && !defined(CORRADE_TARGET_EMSCRIPTEN)

2
src/Magnum/Text/Test/AbstractFontConverterTest.cpp

@ -128,7 +128,7 @@ void AbstractFontConverterTest::exportFontToSingleData() {
{
Containers::Array<char> data(1);
data[0] = '\xee';
return std::move(data);
return data;
}
};

2
src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp

@ -111,7 +111,7 @@ std::vector<std::pair<std::string, Containers::Array<char>>> MagnumFontConverter
std::vector<std::pair<std::string, Containers::Array<char>>> out;
out.emplace_back(filename + ".conf", std::move(confData));
out.emplace_back(filename + ".tga", std::move(tgaData));
return std::move(out);
return out;
}
}}

2
src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

@ -94,7 +94,7 @@ Containers::Array<char> TgaImageConverter::doExportToData(const ImageReference2D
}
#endif
return std::move(data);
return data;
}
}}

Loading…
Cancel
Save