drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 8 Activity

[nostalgia] Remove std::move calls that suppressed copy elision

Browse Source
This commit is contained in:
Gary Talent 2021-12-01 20:09:41 -06:00
parent 163fcf1785
commit 6da3d3b8f5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/userland/gfx_opengl.cpp
View File

@ -143,7 +143,7 @@ static glutils::GLTexture loadTexture(GLsizei w, GLsizei h, void *pixels) noexce
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
return ox::move(tex); return tex;
} }
static void tickFps(GlImplData *id) noexcept { static void tickFps(GlImplData *id) noexcept {

2
src/nostalgia/tools/pack/pack.cpp
View File

@ -97,7 +97,7 @@ static ox::Error copy(ox::FileSystem *src, ox::FileSystem *dest, const ox::Strin
oxOutf("writing {}\n", currentFile); oxOutf("writing {}\n", currentFile);
oxReturnError(dest->write(currentFile.c_str(), buff.data(), buff.size())); oxReturnError(dest->write(currentFile.c_str(), buff.data(), buff.size()));
oxReturnError(verifyFile(dest, currentFile, buff)); oxReturnError(verifyFile(dest, currentFile, buff));
verificationPairs.emplace_back(currentFile, ox::move(buff)); verificationPairs.emplace_back(currentFile, std::move(buff));
} }
} }
// verify all at once in addition to right after the files are written // verify all at once in addition to right after the files are written