Merge pull request #4352 from lioncash/fwd

NANDContentLoader: Add IOFile forward declaration
This commit is contained in:
shuffle2
2016-10-15 16:38:58 -07:00
committed by GitHub
2 changed files with 13 additions and 3 deletions

View File

@ -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)

View 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;