Buildfix, warning fixes

This commit is contained in:
Henrik Rydgård committed 2018-03-01 13:50:56 +01:00
1 parent ee752f5399
commit 1e940f4973
3 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -161,7 +161,7 @@ std::unique_ptr<ManagedTexture> CreateTextureFromFile(Draw::DrawContext *draw, c
delete mtex;
return std::unique_ptr<ManagedTexture>();
}
return std::move(std::unique_ptr<ManagedTexture>(mtex));
return std::unique_ptr<ManagedTexture>(mtex);
}
// TODO: Remove the code duplication between this and LoadFromFileData
@@ -170,5 +170,5 @@ std::unique_ptr<ManagedTexture> CreateTextureFromFileData(Draw::DrawContext *dra
return std::unique_ptr<ManagedTexture>();
ManagedTexture *mtex = new ManagedTexture(draw);
mtex->LoadFromFileData(data, size, type, generateMips);
return std::move(std::unique_ptr<ManagedTexture>(mtex));
return std::unique_ptr<ManagedTexture>(mtex);
}