diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-12-06 23:15:51 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-12-07 05:57:37 -0500 |
| commit | edbbf493f807ed94b9b32cfb7463f9b7f8f27852 (patch) | |
| tree | 1babef3faeba508560effc1db476cbb722a9a709 /Source/Core/DiscIO/FileBlob.cpp | |
| parent | a0ac2b867368aa6f82ee3c471fea2cf1a450b37c (diff) | |
DiscIO: Make factory methods return unique_ptrs
Rather than rely on the developer to do the right thing,
just make the default behavior safely deallocate resources.
If shared semantics are ever needed in the future, the
constructor that takes a unique_ptr for shared_ptr can
be used.
Diffstat (limited to 'Source/Core/DiscIO/FileBlob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/FileBlob.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp index 3e702d650c..79b66b37bc 100644 --- a/Source/Core/DiscIO/FileBlob.cpp +++ b/Source/Core/DiscIO/FileBlob.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include <memory> #include <string> #include "DiscIO/FileBlob.h" @@ -14,13 +15,13 @@ PlainFileReader::PlainFileReader(std::FILE* file) m_size = m_file.GetSize(); } -PlainFileReader* PlainFileReader::Create(const std::string& filename) +std::unique_ptr<PlainFileReader> PlainFileReader::Create(const std::string& filename) { File::IOFile f(filename, "rb"); if (f) - return new PlainFileReader(f.ReleaseHandle()); - else - return nullptr; + return std::unique_ptr<PlainFileReader>(new PlainFileReader(f.ReleaseHandle())); + + return nullptr; } bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) |
