diff options
author | D G Turner | 2017-01-12 08:22:40 +0000 |
---|---|---|
committer | D G Turner | 2017-01-12 08:22:40 +0000 |
commit | adbf18abca0d6a43830645ab0d8ce492bbbd4971 (patch) | |
tree | 60f64382d27a1fcede127c89c2fdd868007c3d58 /backends/fs/ds | |
parent | 6c4b89e6dc439299af68afaa75b366e4aece45c9 (diff) | |
download | scummvm-rg350-adbf18abca0d6a43830645ab0d8ce492bbbd4971.tar.gz scummvm-rg350-adbf18abca0d6a43830645ab0d8ce492bbbd4971.tar.bz2 scummvm-rg350-adbf18abca0d6a43830645ab0d8ce492bbbd4971.zip |
BACKENDS: Fix Shadowing Compiler Warning for isDirectory symbol.
This should ensure that any future cut-and-paste for new backends do not
repeat this same warning issue.
Diffstat (limited to 'backends/fs/ds')
-rw-r--r-- | backends/fs/ds/ds-fs.cpp | 8 | ||||
-rw-r--r-- | backends/fs/ds/ds-fs.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 83b1295838..035178dbb4 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -211,7 +211,7 @@ Common::WriteStream *DSFileSystemNode::createWriteStream() { return Common::wrapBufferedWriteStream(stream, WRITE_BUFFER_SIZE); } -bool DSFileSystemNode::create(bool isDirectory) { +bool DSFileSystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } @@ -271,7 +271,7 @@ GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path) { _path = path; } -GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path, bool isDir) { +GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path, bool isDirectoryFlag) { //consolePrintf("'%s'",path.c_str()); int lastSlash = 3; @@ -284,7 +284,7 @@ GBAMPFileSystemNode::GBAMPFileSystemNode(const Common::String& path, bool isDir) _displayName = Common::String(path.c_str() + lastSlash + 1); _path = path; _isValid = true; - _isDirectory = isDir; + _isDirectory = isDirectoryFlag; } @@ -398,7 +398,7 @@ Common::WriteStream *GBAMPFileSystemNode::createWriteStream() { return Common::wrapBufferedWriteStream(stream, WRITE_BUFFER_SIZE); } -bool GBAMPFileSystemNode::create(bool isDirectory) { +bool GBAMPFileSystemNode::create(bool isDirectoryFlag) { error("Not supported"); return false; } diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index 939d1a1555..12dd6d6a59 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -91,7 +91,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); /** * Returns the zip file this node points to. @@ -132,7 +132,7 @@ public: * @param path String with the path the new node should point to. * @param path true if path is a directory, false otherwise. */ - GBAMPFileSystemNode(const Common::String &path, bool isDirectory); + GBAMPFileSystemNode(const Common::String &path, bool isDirectoryFlag); /** * Copy constructor. @@ -157,7 +157,7 @@ public: virtual Common::SeekableReadStream *createReadStream(); virtual Common::WriteStream *createWriteStream(); - virtual bool create(bool isDirectory); + virtual bool create(bool isDirectoryFlag); }; struct fileHandle { |