diff --git a/include/nod/DiscBase.hpp b/include/nod/DiscBase.hpp index 9efc704..ebda310 100644 --- a/include/nod/DiscBase.hpp +++ b/include/nod/DiscBase.hpp @@ -363,7 +363,7 @@ public: virtual ~DiscBuilderBase() {} DiscBuilderBase(const SystemChar* outPath, int64_t discCapacity, std::function progressCB) - : m_outPath(outPath), m_fileIO(std::move(NewFileIO(outPath, discCapacity))), + : m_outPath(outPath), m_fileIO(NewFileIO(outPath, discCapacity)), m_discCapacity(discCapacity), m_progressCB(progressCB) {} IFileIO& getFileIO() {return *m_fileIO;} diff --git a/lib/DirectoryEnumerator.cpp b/lib/DirectoryEnumerator.cpp index 48e37d1..bc5f108 100644 --- a/lib/DirectoryEnumerator.cpp +++ b/lib/DirectoryEnumerator.cpp @@ -177,7 +177,7 @@ DirectoryEnumerator::DirectoryEnumerator(const SystemChar* path, Mode mode, else continue; - m_entries.push_back(std::move(Entry(std::move(fp), d->d_name, sz, isDir))); + m_entries.push_back(Entry(std::move(fp), d->d_name, sz, isDir)); } break; case Mode::DirsThenFilesSorted: diff --git a/lib/DiscIOISO.cpp b/lib/DiscIOISO.cpp index c887c7f..e5cc8b1 100644 --- a/lib/DiscIOISO.cpp +++ b/lib/DiscIOISO.cpp @@ -11,7 +11,7 @@ class DiscIOISO : public IDiscIO std::unique_ptr m_fio; public: DiscIOISO(const SystemString& fpin) - : m_fio(std::move(NewFileIO(fpin))) {} + : m_fio(NewFileIO(fpin)) {} class ReadStream : public IReadStream { @@ -30,7 +30,7 @@ public: std::unique_ptr beginReadStream(uint64_t offset) const { - return std::unique_ptr(new ReadStream(std::move(m_fio->beginReadStream(offset)))); + return std::unique_ptr(new ReadStream(m_fio->beginReadStream(offset))); } class WriteStream : public IWriteStream @@ -48,7 +48,7 @@ public: std::unique_ptr beginWriteStream(uint64_t offset) const { - return std::unique_ptr(new WriteStream(std::move(m_fio->beginWriteStream(offset)))); + return std::unique_ptr(new WriteStream(m_fio->beginWriteStream(offset))); } };