From edbbf493f807ed94b9b32cfb7463f9b7f8f27852 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 6 Dec 2015 23:15:51 -0500 Subject: 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. --- Source/Core/DiscIO/WbfsBlob.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'Source/Core/DiscIO/WbfsBlob.cpp') diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index 7aaa09c8b1..1ce88fa7d3 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -167,19 +168,14 @@ File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available) return m_files[0]->file; } -WbfsFileReader* WbfsFileReader::Create(const std::string& filename) +std::unique_ptr WbfsFileReader::Create(const std::string& filename) { - WbfsFileReader* reader = new WbfsFileReader(filename); + auto reader = std::unique_ptr(new WbfsFileReader(filename)); - if (reader->IsGood()) - { - return reader; - } - else - { - delete reader; - return nullptr; - } + if (!reader->IsGood()) + reader.reset(); + + return reader; } bool IsWbfsBlob(const std::string& filename) -- cgit v1.2.3