preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-07 05:03:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Warning fixes for new LLVM on mac (warns on inconsistent usage of override)

Browse Source
This commit is contained in:
Henrik Rydgård
2015-09-17 20:29:37 +02:00
parent a3eb31994b
commit a71fbccfbc
23 changed files with 125 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/FileSystems/ISOFileSystem.h
+6 -9
View File
@@ -26,8 +26,7 @@
bool parseLBN(std::string filename, u32 *sectorStart, u32 *readSize);
class ISOFileSystem : public IFileSystem
{
class ISOFileSystem : public IFileSystem {
public:
ISOFileSystem(IHandleAllocator *_hAlloc, BlockDevice *_blockDevice, std::string _restrictPath = "");
~ISOFileSystem();
@@ -49,15 +48,14 @@ public:
size_t WriteFile(u32 handle, const u8 *pointer, s64 size) override;
size_t WriteFile(u32 handle, const u8 *pointer, s64 size, int &usec) override;
bool GetHostPath(const std::string &inpath, std::string &outpath) {return false;}
bool GetHostPath(const std::string &inpath, std::string &outpath) override {return false;}
bool MkDir(const std::string &dirname) override {return false;}
bool RmDir(const std::string &dirname) override { return false; }
int RenameFile(const std::string &from, const std::string &to) override { return -1; }
bool RemoveFile(const std::string &filename) override { return false; }
private:
struct TreeEntry
{
struct TreeEntry {
TreeEntry(){}
~TreeEntry();
@@ -71,8 +69,7 @@ private:
std::vector<TreeEntry*> children;
};
struct OpenFileEntry
{
struct OpenFileEntry {
TreeEntry *file;
unsigned int seekPos; // TODO: Make 64-bit?
bool isRawSector; // "/sce_lbn" mode
@@ -80,7 +77,7 @@ private:
u32 sectorStart;
u32 openSize;
};
typedef std::map<u32,OpenFileEntry> EntryMap;
EntryMap entries;
IHandleAllocator *hAlloc;
@@ -147,7 +144,7 @@ public:
size_t WriteFile(u32 handle, const u8 *pointer, s64 size, int &usec) override {
return isoFileSystem_->WriteFile(handle, pointer, size, usec);
}
bool GetHostPath(const std::string &inpath, std::string &outpath) { return false; }
bool GetHostPath(const std::string &inpath, std::string &outpath) override { return false; }
bool MkDir(const std::string &dirname) override { return false; }
bool RmDir(const std::string &dirname) override { return false; }
int RenameFile(const std::string &from, const std::string &to) override { return -1; }