Skip to content

Commit f9481ee

Browse files
authored
Merge pull request #26 from Hailios/added_move
use move when parameters are passed by value and only copied once
2 parents 8db1ffb + d34a5ab commit f9481ee

File tree

9 files changed

+14
-13
lines changed

9 files changed

+14
-13
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Willy Scheibel <[email protected]> <[email protected]>
77
Thanks to all Contributors:
88

99
Robert Bielik (https://github.com/robiwano)
10+
Hailios (https://github.com/Hailios)

source/cppfs/source/FileHandle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ std::vector<std::string> FileHandle::listFiles() const
124124

125125
void FileHandle::traverse(VisitFunc funcFileEntry)
126126
{
127-
FunctionalFileVisitor visitor(funcFileEntry);
127+
FunctionalFileVisitor visitor(std::move(funcFileEntry));
128128
traverse(visitor);
129129
}
130130

131131
void FileHandle::traverse(VisitFunc funcFile, VisitFunc funcDirectory)
132132
{
133-
FunctionalFileVisitor visitor(funcFile, funcDirectory);
133+
FunctionalFileVisitor visitor(std::move(funcFile), std::move(funcDirectory));
134134
traverse(visitor);
135135
}
136136

source/cppfs/source/FileWatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void FileWatcher::addHandler(FileEventHandler * eventHandler)
8989
void FileWatcher::addHandler(EventFunc funcFileEvent)
9090
{
9191
// Create event handler
92-
auto ptr = std::unique_ptr<FunctionalFileEventHandler>(new FunctionalFileEventHandler(funcFileEvent));
92+
auto ptr = std::unique_ptr<FunctionalFileEventHandler>(new FunctionalFileEventHandler(std::move(funcFileEvent)));
9393

9494
// Register event handler
9595
addHandler(ptr.get());

source/cppfs/source/FunctionalFileEventHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FunctionalFileEventHandler::FunctionalFileEventHandler()
1111
}
1212

1313
FunctionalFileEventHandler::FunctionalFileEventHandler(EventFunc funcFileEvent)
14-
: m_funcFileEvent(funcFileEvent)
14+
: m_funcFileEvent(std::move(funcFileEvent))
1515
{
1616
}
1717

source/cppfs/source/FunctionalFileVisitor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ FunctionalFileVisitor::FunctionalFileVisitor()
1313
}
1414

1515
FunctionalFileVisitor::FunctionalFileVisitor(VisitFunc funcFileEntry)
16-
: m_funcFileEntry(funcFileEntry)
16+
: m_funcFileEntry(std::move(funcFileEntry))
1717
{
1818
}
1919

2020
FunctionalFileVisitor::FunctionalFileVisitor(VisitFunc funcFile, VisitFunc funcDirectory)
21-
: m_funcFile(funcFile)
22-
, m_funcDirectory(funcDirectory)
21+
: m_funcFile(std::move(funcFile))
22+
, m_funcDirectory(std::move(funcDirectory))
2323
{
2424
}
2525

source/cppfs/source/linux/LocalFileWatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace cppfs
2020

2121
LocalFileWatcher::LocalFileWatcher(FileWatcher * fileWatcher, std::shared_ptr<LocalFileSystem> fs)
2222
: AbstractFileWatcherBackend(fileWatcher)
23-
, m_fs(fs)
23+
, m_fs(std::move(fs))
2424
, m_inotify(-1)
2525
{
2626
// Create inotify instance

source/cppfs/source/posix/LocalFileHandle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ namespace cppfs
1818

1919

2020
LocalFileHandle::LocalFileHandle(std::shared_ptr<LocalFileSystem> fs, const std::string & path)
21-
: LocalFileHandle(fs, std::string(path))
21+
: LocalFileHandle(std::move(fs), std::string(path))
2222
{
2323
}
2424

2525
LocalFileHandle::LocalFileHandle(std::shared_ptr<LocalFileSystem> fs, std::string && path)
26-
: m_fs(fs)
26+
: m_fs(std::move(fs))
2727
, m_path(path)
2828
, m_fileInfo(nullptr)
2929
, m_linkInfo(nullptr)

source/cppfs/source/posix/LocalFileIterator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ namespace cppfs
1212

1313

1414
LocalFileIterator::LocalFileIterator(std::shared_ptr<LocalFileSystem> fs, const std::string & path)
15-
: LocalFileIterator(fs, std::string(path))
15+
: LocalFileIterator(std::move(fs), std::string(path))
1616
{
1717
}
1818

1919
LocalFileIterator::LocalFileIterator(std::shared_ptr<LocalFileSystem> fs, std::string && path)
20-
: m_fs(fs)
20+
: m_fs(std::move(fs))
2121
, m_path(path)
2222
, m_dir(nullptr)
2323
, m_entry(nullptr)

source/cppfs/source/posix/LocalFileSystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ FileHandle LocalFileSystem::open(std::string && path)
3232
{
3333
return FileHandle(
3434
std::unique_ptr<AbstractFileHandleBackend>(
35-
new LocalFileHandle(shared_from_this(), path)
35+
new LocalFileHandle(shared_from_this(), std::move(path))
3636
)
3737
);
3838
}

0 commit comments

Comments
 (0)