From e1192bc64bb06f493724f5446c4e6d2a6820881e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Aug 2014 18:55:37 -0400 Subject: [PATCH] Core: Fix usages of NULL and 0 literals for pointers in GCMemcardDirectory --- Source/Core/Core/HW/GCMemcardDirectory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/HW/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcardDirectory.cpp index aa97291991..7862567c31 100644 --- a/Source/Core/Core/HW/GCMemcardDirectory.cpp +++ b/Source/Core/Core/HW/GCMemcardDirectory.cpp @@ -135,7 +135,7 @@ GCMemcardDirectory::GCMemcardDirectory(std::string directory, int slot, u16 size { std::string ext; std::string const &name = FST_Temp.children[j].virtualName; - SplitPath(name, NULL, NULL, &ext); + SplitPath(name, nullptr, nullptr, &ext); if (strcasecmp(ext.c_str(), ".gci") == 0) { if (m_saves.size() == DIRLEN) @@ -553,7 +553,7 @@ void GCMemcardDirectory::Flush(bool exiting) void GCMemcardDirectory::DoState(PointerWrap &p) { m_LastBlock = -1; - m_LastBlockAddress = 0; + m_LastBlockAddress = nullptr; p.Do(m_SaveDirectory); p.DoPOD
(m_hdr); p.DoPOD(m_dir1);