blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 10:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use std::move when returning a local variable, allow NRVO

Browse source
This commit is contained in:
Dan Paulat 2022-10-08 00:03:47 -05:00
parent d73c1597d2
commit 976617d342
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scwx-qt/source/scwx/qt/config/radar_site.cpp
View file

@ -157,7 +157,7 @@ std::vector<std::shared_ptr<RadarSite>> RadarSite::GetAll()
radarSites.push_back(site.second); radarSites.push_back(site.second);
} }
return std::move(radarSites); return radarSites;
} }
std::string GetRadarIdFromSiteId(const std::string& siteId) std::string GetRadarIdFromSiteId(const std::string& siteId)

6
scwx-qt/source/scwx/qt/util/texture_atlas.cpp
View file

@ -260,7 +260,7 @@ TextureAtlas::Impl::LoadImage(const std::string& imagePath)
if (!imageFile.isOpen()) if (!imageFile.isOpen())
{ {
logger_->error("Could not open image: {}", imagePath); logger_->error("Could not open image: {}", imagePath);
return std::move(image); return image;
} }
boost::iostreams::stream<util::IoDeviceSource> dataStream(imageFile); boost::iostreams::stream<util::IoDeviceSource> dataStream(imageFile);
@ -275,10 +275,10 @@ TextureAtlas::Impl::LoadImage(const std::string& imagePath)
catch (const std::exception& ex) catch (const std::exception& ex)
{ {
logger_->error("Error reading image: {}", ex.what()); logger_->error("Error reading image: {}", ex.what());
return std::move(image); return image;
} }
return std::move(image); return image;
} }
TextureAtlas& TextureAtlas::Instance() TextureAtlas& TextureAtlas::Instance()