mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
NANDContentLoader: Add IOFile forward declaration
This would previously fail to compile when included in files that do not include FileUtil.h due to lack of a type declaration. This moves the constructor and destructor into the cpp file in order to satisfy the requirements of unique_ptr construction and deletion. That is, unique_ptr requires a concrete type at the point of construction and destruction. If the constructor or destructor is left in the header, then at the point of construction or destruction, IOFile will still be considered an incomplete type, as unique_ptr's deleter will still only be able to see the forward declaration, which it can't use.
This commit is contained in:
@ -96,6 +96,12 @@ std::string CSharedContent::AddSharedContent(const u8* hash)
|
|||||||
return filename;
|
return filename;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CNANDContentDataFile::CNANDContentDataFile(const std::string& filename) : m_filename{filename}
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
CNANDContentDataFile::~CNANDContentDataFile() = default;
|
||||||
|
|
||||||
void CNANDContentDataFile::EnsureOpen()
|
void CNANDContentDataFile::EnsureOpen()
|
||||||
{
|
{
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
|
@ -13,13 +13,15 @@
|
|||||||
#include "Common/CommonTypes.h"
|
#include "Common/CommonTypes.h"
|
||||||
#include "Common/NandPaths.h"
|
#include "Common/NandPaths.h"
|
||||||
|
|
||||||
namespace DiscIO
|
namespace File
|
||||||
{
|
{
|
||||||
enum class Country;
|
class IOFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace DiscIO
|
namespace DiscIO
|
||||||
{
|
{
|
||||||
|
enum class Country;
|
||||||
|
|
||||||
bool AddTicket(u64 title_id, const std::vector<u8>& ticket);
|
bool AddTicket(u64 title_id, const std::vector<u8>& ticket);
|
||||||
|
|
||||||
class CNANDContentData
|
class CNANDContentData
|
||||||
@ -35,7 +37,9 @@ public:
|
|||||||
class CNANDContentDataFile final : public CNANDContentData
|
class CNANDContentDataFile final : public CNANDContentData
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit CNANDContentDataFile(const std::string& filename) : m_filename(filename) {}
|
explicit CNANDContentDataFile(const std::string& filename);
|
||||||
|
~CNANDContentDataFile();
|
||||||
|
|
||||||
void Open() override;
|
void Open() override;
|
||||||
std::vector<u8> Get() override;
|
std::vector<u8> Get() override;
|
||||||
bool GetRange(u32 start, u32 size, u8* buffer) override;
|
bool GetRange(u32 start, u32 size, u8* buffer) override;
|
||||||
|
Reference in New Issue
Block a user