piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DiscIO: Make factory methods return unique_ptrs

Browse Source 
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.
This commit is contained in:
Lioncash
2015-12-06 23:15:51 -05:00
parent a0ac2b8673
commit edbbf493f8
22 changed files with 204 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DiscIO/Filesystem.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <memory>
#include "DiscIO/Filesystem.h"
#include "DiscIO/FileSystemGCWii.h"
@ -17,20 +18,17 @@ IFileSystem::~IFileSystem()
{}
IFileSystem* CreateFileSystem(const IVolume* _rVolume)
std::unique_ptr<IFileSystem> CreateFileSystem(const IVolume* volume)
{
IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);
std::unique_ptr<IFileSystem> filesystem = std::make_unique<CFileSystemGCWii>(volume);
if (!pFileSystem)
if (!filesystem)
return nullptr;
if (!pFileSystem->IsValid())
{
delete pFileSystem;
pFileSystem = nullptr;
}
if (!filesystem->IsValid())
filesystem.reset();
return pFileSystem;
return filesystem;
}
} // namespace