Merge pull request #11 from lioncash/make

General: Use std::make_unique where applicable
This commit is contained in:
2019-08-30 16:28:53 -07:00
committed by GitHub
9 changed files with 144 additions and 93 deletions

View File

@@ -99,17 +99,23 @@ public:
}
};
std::unique_ptr<IWriteStream> beginWriteStream() const override {
bool Err = false;
auto ret = std::unique_ptr<IWriteStream>(new WriteStream(m_path, m_maxWriteSize, Err));
if (Err)
return {};
bool err = false;
auto ret = std::make_unique<WriteStream>(m_path, m_maxWriteSize, err);
if (err) {
return nullptr;
}
return ret;
}
std::unique_ptr<IWriteStream> beginWriteStream(uint64_t offset) const override {
bool Err = false;
auto ret = std::unique_ptr<IWriteStream>(new WriteStream(m_path, offset, m_maxWriteSize, Err));
if (Err)
return {};
bool err = false;
auto ret = std::make_unique<WriteStream>(m_path, offset, m_maxWriteSize, err);
if (err) {
return nullptr;
}
return ret;
}
@@ -170,24 +176,32 @@ public:
return written;
}
};
std::unique_ptr<IReadStream> beginReadStream() const override {
bool Err = false;
auto ret = std::unique_ptr<IReadStream>(new ReadStream(m_path, Err));
if (Err)
return {};
bool err = false;
auto ret = std::make_unique<ReadStream>(m_path, err);
if (err) {
return nullptr;
}
return ret;
}
std::unique_ptr<IReadStream> beginReadStream(uint64_t offset) const override {
bool Err = false;
auto ret = std::unique_ptr<IReadStream>(new ReadStream(m_path, offset, Err));
if (Err)
return {};
bool err = false;
auto ret = std::make_unique<ReadStream>(m_path, offset, err);
if (err) {
return nullptr;
}
return ret;
}
};
std::unique_ptr<IFileIO> NewFileIO(SystemStringView path, int64_t maxWriteSize) {
return std::unique_ptr<IFileIO>(new FileIOWin32(path, maxWriteSize));
return std::make_unique<FileIOWin32>(path, maxWriteSize);
}
} // namespace nod