ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filesystem: Make destructors = default

This commit is contained in:
JosJuice 2017-06-13 23:05:30 +02:00
parent 0b7d2e7c68
commit 583406d900
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DiscIO/FileSystemGCWii.cpp
View File

@ -45,9 +45,7 @@ FileInfoGCWii::FileInfoGCWii(const FileInfoGCWii& file_info, u32 index)
{ {
} }
FileInfoGCWii::~FileInfoGCWii() FileInfoGCWii::~FileInfoGCWii() = default;
{
}
uintptr_t FileInfoGCWii::GetAddress() const uintptr_t FileInfoGCWii::GetAddress() const
{ {
@ -252,9 +250,7 @@ FileSystemGCWii::FileSystemGCWii(const Volume* volume, const Partition& partitio
m_valid = m_root.IsValid(fst_size, m_root); m_valid = m_root.IsValid(fst_size, m_root);
} }
FileSystemGCWii::~FileSystemGCWii() FileSystemGCWii::~FileSystemGCWii() = default;
{
}
const FileInfo& FileSystemGCWii::GetRoot() const const FileInfo& FileSystemGCWii::GetRoot() const
{ {

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

@ -9,18 +9,14 @@
namespace DiscIO namespace DiscIO
{ {
FileInfo::~FileInfo() FileInfo::~FileInfo() = default;
{
}
FileSystem::FileSystem(const Volume* volume, const Partition& partition) FileSystem::FileSystem(const Volume* volume, const Partition& partition)
: m_volume(volume), m_partition(partition) : m_volume(volume), m_partition(partition)
{ {
} }
FileSystem::~FileSystem() FileSystem::~FileSystem() = default;
{
}
std::unique_ptr<FileSystem> CreateFileSystem(const Volume* volume, const Partition& partition) std::unique_ptr<FileSystem> CreateFileSystem(const Volume* volume, const Partition& partition)
{ {

2
Source/Core/DiscIO/Filesystem.h
View File

@ -34,7 +34,7 @@ public:
const_iterator(std::unique_ptr<FileInfo> file_info) : m_file_info(std::move(file_info)) {} const_iterator(std::unique_ptr<FileInfo> file_info) : m_file_info(std::move(file_info)) {}
const_iterator(const const_iterator& it) : m_file_info(it.m_file_info->clone()) {} const_iterator(const const_iterator& it) : m_file_info(it.m_file_info->clone()) {}
const_iterator(const_iterator&& it) : m_file_info(std::move(it.m_file_info)) {} const_iterator(const_iterator&& it) : m_file_info(std::move(it.m_file_info)) {}
~const_iterator() {} ~const_iterator() = default;
const_iterator& operator=(const const_iterator& it) const_iterator& operator=(const const_iterator& it)
{ {
m_file_info = it.m_file_info ? it.m_file_info->clone() : nullptr; m_file_info = it.m_file_info ? it.m_file_info->clone() : nullptr;