diff options
| author | skidau <skidau@gmail.com> | 2015-03-13 12:20:43 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-13 12:20:43 +1100 |
| commit | 2916aed1f93ee12e531d3b1f725f46d1563bdba5 (patch) | |
| tree | 2781ccc0f9e3b0027e00cc093885e885d1bc51ea /Source/Core/DiscIO/NANDContentLoader.cpp | |
| parent | 899a5078a0ba74d7737218dc0cd881a69f1caa62 (diff) | |
| parent | 66bb3000c25b98db9eeac84fdf27d1daa8afbe12 (diff) | |
Merge pull request #2195 from JosJuice/nandcontentloader-singletons
Don't construct NANDContentLoader classes before Main.cpp runs
Diffstat (limited to 'Source/Core/DiscIO/NANDContentLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/NANDContentLoader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index 8da2cd65d8..830a9d75ff 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -25,9 +25,6 @@ namespace DiscIO { -CSharedContent CSharedContent::m_Instance; -cUIDsys cUIDsys::m_Instance; - CSharedContent::CSharedContent() { @@ -306,9 +303,6 @@ DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const } -CNANDContentManager CNANDContentManager::m_Instance; - - CNANDContentManager::~CNANDContentManager() { for (auto& entry : m_Map) |