diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-03-01 03:06:14 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-03-01 03:06:14 +0000 |
| commit | a5b471f4903646e44d03ea8ca6a830002342198c (patch) | |
| tree | 8c969652f59077466ed74ca9af10cf9ceaf37290 /Source/Core/DiscIO/Src/NANDContentLoader.cpp | |
| parent | ba54fac9eb74be6f73e20e2de953cf6f355be57f (diff) | |
More conversion from char * to std::string.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7266 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/NANDContentLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index eb23059c88..8de4eff0d5 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -157,11 +157,11 @@ CNANDContentLoader::CNANDContentLoader(const std::string& _rName) , m_IosVersion(0x09) , m_BootIndex(-1) { - if (File::IsDirectory(_rName.c_str())) + if (File::IsDirectory(_rName)) { m_Valid = CreateFromDirectory(_rName); } - else if (File::Exists(_rName.c_str())) + else if (File::Exists(_rName)) { m_Valid = CreateFromWAD(_rName); } @@ -210,7 +210,7 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath) TMDFileName.c_str()); return false; } - u64 Size = File::GetSize(TMDFileName.c_str()); + u64 Size = File::GetSize(TMDFileName); u8* pTMD = new u8[(u32)Size]; fread(pTMD, (size_t)Size, 1, pTMDFile); fclose(pTMDFile); |