summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2016-10-15 16:38:58 -0700
committerGitHub <noreply@github.com>2016-10-15 16:38:58 -0700
commitd2d4edf964924bbf1badf23cc09ead45c0cf947a (patch)
tree6381af6672e3de5628469328a5f9be5a2e20e5f0 /Source/Core
parent74939f316fd176f714ac5316d0fefe0a267fc1d1 (diff)
parentd9eb7c4e803ecc277cb7456db7627a5b761ea7bf (diff)
Merge pull request #4352 from lioncash/fwd
NANDContentLoader: Add IOFile forward declaration
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DiscIO/NANDContentLoader.cpp6
-rw-r--r--Source/Core/DiscIO/NANDContentLoader.h10
2 files changed, 13 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index 3f2c746bd6..4a67f09405 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -96,6 +96,12 @@ std::string CSharedContent::AddSharedContent(const u8* hash)
return filename;
}
+CNANDContentDataFile::CNANDContentDataFile(const std::string& filename) : m_filename{filename}
+{
+}
+
+CNANDContentDataFile::~CNANDContentDataFile() = default;
+
void CNANDContentDataFile::EnsureOpen()
{
if (!m_file)
diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h
index 6c9df0d545..6643e2789c 100644
--- a/Source/Core/DiscIO/NANDContentLoader.h
+++ b/Source/Core/DiscIO/NANDContentLoader.h
@@ -13,13 +13,15 @@
#include "Common/CommonTypes.h"
#include "Common/NandPaths.h"
-namespace DiscIO
+namespace File
{
-enum class Country;
+class IOFile;
}
namespace DiscIO
{
+enum class Country;
+
bool AddTicket(u64 title_id, const std::vector<u8>& ticket);
class CNANDContentData
@@ -35,7 +37,9 @@ public:
class CNANDContentDataFile final : public CNANDContentData
{
public:
- explicit CNANDContentDataFile(const std::string& filename) : m_filename(filename) {}
+ explicit CNANDContentDataFile(const std::string& filename);
+ ~CNANDContentDataFile();
+
void Open() override;
std::vector<u8> Get() override;
bool GetRange(u32 start, u32 size, u8* buffer) override;