From 583406d900bd0ca9111135c6a9e526aed67e8322 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 13 Jun 2017 23:05:30 +0200 Subject: [PATCH] Filesystem: Make destructors = default --- Source/Core/DiscIO/FileSystemGCWii.cpp | 8 ++------ Source/Core/DiscIO/Filesystem.cpp | 8 ++------ Source/Core/DiscIO/Filesystem.h | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 62e29b2b5c..09a171677d 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -45,9 +45,7 @@ FileInfoGCWii::FileInfoGCWii(const FileInfoGCWii& file_info, u32 index) { } -FileInfoGCWii::~FileInfoGCWii() -{ -} +FileInfoGCWii::~FileInfoGCWii() = default; 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); } -FileSystemGCWii::~FileSystemGCWii() -{ -} +FileSystemGCWii::~FileSystemGCWii() = default; const FileInfo& FileSystemGCWii::GetRoot() const { diff --git a/Source/Core/DiscIO/Filesystem.cpp b/Source/Core/DiscIO/Filesystem.cpp index 807fb6c3eb..6171c3004f 100644 --- a/Source/Core/DiscIO/Filesystem.cpp +++ b/Source/Core/DiscIO/Filesystem.cpp @@ -9,18 +9,14 @@ namespace DiscIO { -FileInfo::~FileInfo() -{ -} +FileInfo::~FileInfo() = default; FileSystem::FileSystem(const Volume* volume, const Partition& partition) : m_volume(volume), m_partition(partition) { } -FileSystem::~FileSystem() -{ -} +FileSystem::~FileSystem() = default; std::unique_ptr CreateFileSystem(const Volume* volume, const Partition& partition) { diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index 30f524281d..879c6fbbdd 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -34,7 +34,7 @@ public: const_iterator(std::unique_ptr 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_iterator&& it) : m_file_info(std::move(it.m_file_info)) {} - ~const_iterator() {} + ~const_iterator() = default; const_iterator& operator=(const const_iterator& it) { m_file_info = it.m_file_info ? it.m_file_info->clone() : nullptr;