diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-12-07 19:12:15 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-12-07 19:12:15 +0100 |
| commit | 9719804cd2f61adf2ab7f0dfc15efda36c5df529 (patch) | |
| tree | 7c368eff997e8db51cc6af795bf30ccf34f8ae7e /Source/Core/DiscIO/CISOBlob.cpp | |
| parent | 31a40447d8e9d8e4d29aa58d02df20e957d8d24b (diff) | |
| parent | edbbf493f807ed94b9b32cfb7463f9b7f8f27852 (diff) | |
Merge pull request #3320 from lioncash/factory
DiscIO: Make factory methods return unique_ptrs
Diffstat (limited to 'Source/Core/DiscIO/CISOBlob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/CISOBlob.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp index f9947d0e6c..9c7f440cf9 100644 --- a/Source/Core/DiscIO/CISOBlob.cpp +++ b/Source/Core/DiscIO/CISOBlob.cpp @@ -4,6 +4,7 @@ #include <algorithm> #include <cstdio> +#include <memory> #include "Common/CommonTypes.h" #include "Common/FileUtil.h" @@ -29,17 +30,15 @@ CISOFileReader::CISOFileReader(std::FILE* file) m_ciso_map[idx] = (1 == header.map[idx]) ? count++ : UNUSED_BLOCK_ID; } -CISOFileReader* CISOFileReader::Create(const std::string& filename) +std::unique_ptr<CISOFileReader> CISOFileReader::Create(const std::string& filename) { if (IsCISOBlob(filename)) { File::IOFile f(filename, "rb"); - return new CISOFileReader(f.ReleaseHandle()); - } - else - { - return nullptr; + return std::unique_ptr<CISOFileReader>(new CISOFileReader(f.ReleaseHandle())); } + + return nullptr; } u64 CISOFileReader::GetDataSize() const |