diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-09-19 22:11:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 22:11:54 +0200 |
| commit | 26bb01217803c238ffb61be200ee28c008016ba9 (patch) | |
| tree | 881995ba50def51e4bbc9a352dcbeff5f248b3db /Source/Core | |
| parent | 04e6aaf419feb18e7b2f2be19aabd4b34660ce31 (diff) | |
| parent | 144c23dead80f1ebe23ce26927cdc35a8813608d (diff) | |
Merge pull request #4226 from lioncash/fs
Filesystem: Return strings from GetFileName without the const qualifier
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.h | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Filesystem.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 9e27e6f70e..b19fd7cf95 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -44,7 +44,7 @@ u64 CFileSystemGCWii::GetFileSize(const std::string& _rFullPath) return 0; } -const std::string CFileSystemGCWii::GetFileName(u64 _Address) +std::string CFileSystemGCWii::GetFileName(u64 _Address) { if (!m_Initialized) InitFileSystem(); diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h index 0418557cde..ac75f1acf0 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.h +++ b/Source/Core/DiscIO/FileSystemGCWii.h @@ -24,7 +24,7 @@ public: bool IsValid() const override { return m_Valid; } u64 GetFileSize(const std::string& _rFullPath) override; const std::vector<SFileInfo>& GetFileList() override; - const std::string GetFileName(u64 _Address) override; + std::string GetFileName(u64 _Address) override; u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, u64 _OffsetInFile) override; bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) override; diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index b168597c38..25a414d980 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -46,7 +46,7 @@ public: virtual bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) = 0; virtual bool ExportApploader(const std::string& _rExportFolder) const = 0; virtual bool ExportDOL(const std::string& _rExportFolder) const = 0; - virtual const std::string GetFileName(u64 _Address) = 0; + virtual std::string GetFileName(u64 _Address) = 0; virtual u64 GetBootDOLOffset() const = 0; virtual u32 GetBootDOLSize(u64 dol_offset) const = 0; |
