From 337a52a41ea44570da65586403f14248042f0169 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 29 Jun 2017 21:44:11 +0300 Subject: Use std::move in some places. --- src/fs/virtfs/fs.cpp | 11 ++++++----- src/fs/virtfs/fsdir.cpp | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/fs') diff --git a/src/fs/virtfs/fs.cpp b/src/fs/virtfs/fs.cpp index d9973d79b..9fe755560 100644 --- a/src/fs/virtfs/fs.cpp +++ b/src/fs/virtfs/fs.cpp @@ -34,6 +34,7 @@ #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/stdmove.h" #include "utils/stringutils.h" #include "debug.h" @@ -153,7 +154,7 @@ namespace VirtFs return list; } - std::string rootDir = dirName; + std::string rootDir = STD_MOVE(dirName); if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; StringVect &names = list->names; @@ -178,7 +179,7 @@ namespace VirtFs return; } - std::string rootDir = dirName; + std::string rootDir = STD_MOVE(dirName); if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; @@ -200,7 +201,7 @@ namespace VirtFs return; } - std::string rootDir = dirName; + std::string rootDir = STD_MOVE(dirName); if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; @@ -223,7 +224,7 @@ namespace VirtFs return; } - std::string rootDir = dirName; + std::string rootDir = STD_MOVE(dirName); if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; @@ -243,7 +244,7 @@ namespace VirtFs name.c_str()); return false; } - std::string dirName = name; + std::string dirName = STD_MOVE(name); if (findLast(dirName, std::string(dirSeparator)) == false) dirName += dirSeparator; diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp index d4e9ce900..59097e5be 100644 --- a/src/fs/virtfs/fsdir.cpp +++ b/src/fs/virtfs/fsdir.cpp @@ -32,6 +32,7 @@ #include "utils/checkutils.h" #include "utils/foreach.h" +#include "utils/stdmove.h" #include "utils/stringutils.h" #include @@ -274,7 +275,7 @@ namespace FsDir bool setWriteDir(std::string newDir) { prepareFsPath(newDir); - mWriteDir = newDir; + mWriteDir = STD_MOVE(newDir); if (findLast(mWriteDir, std::string(dirSeparator)) == false) mWriteDir += dirSeparator; return true; -- cgit v1.2.3-60-g2f50