[Scummvm-git-logs] scummvm master -> 2615e95768cb5155ba26027a7dc1189b54524d6e
digitall
dgturner at iee.org
Thu Jan 12 06:39:01 CET 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4dc175a4c2 WIN32: Fix Variable Shadowing Compiler Warnings.
2615e95768 WII: Fix Variable Shadowing Compiler Warnings.
Commit: 4dc175a4c2109ae17f524bde3b574799fcd20a56
https://github.com/scummvm/scummvm/commit/4dc175a4c2109ae17f524bde3b574799fcd20a56
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-12T05:44:50Z
Commit Message:
WIN32: Fix Variable Shadowing Compiler Warnings.
These are emitted when using the MinGW compiler.
Changed paths:
backends/fs/windows/windows-fs.cpp
backends/fs/windows/windows-fs.h
diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp
index b43686f..caf0e31 100644
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@@ -244,10 +244,10 @@ Common::WriteStream *WindowsFilesystemNode::createWriteStream() {
return StdioStream::makeFromPath(getPath(), true);
}
-bool WindowsFilesystemNode::create(bool isDirectory) {
+bool WindowsFilesystemNode::create(bool isDirectoryFlag) {
bool success;
- if (isDirectory) {
+ if (isDirectoryFlag) {
success = CreateDirectory(toUnicode(_path.c_str()), NULL) != 0;
} else {
success = CreateFile(toUnicode(_path.c_str()), GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL) != INVALID_HANDLE_VALUE;
@@ -264,12 +264,12 @@ bool WindowsFilesystemNode::create(bool isDirectory) {
_path += '\\';
}
- if (_isDirectory != isDirectory) warning("failed to create %s: got %s", isDirectory ? "directory" : "file", _isDirectory ? "directory" : "file");
- return _isDirectory == isDirectory;
+ if (_isDirectory != isDirectoryFlag) warning("failed to create %s: got %s", isDirectoryFlag ? "directory" : "file", _isDirectory ? "directory" : "file");
+ return _isDirectory == isDirectoryFlag;
}
warning("WindowsFilesystemNode: Create%s() was a success, but GetFileAttributes() indicates there is no such %s",
- isDirectory ? "Directory" : "File", isDirectory ? "directory" : "file");
+ isDirectoryFlag ? "Directory" : "File", isDirectoryFlag ? "directory" : "file");
return false;
}
diff --git a/backends/fs/windows/windows-fs.h b/backends/fs/windows/windows-fs.h
index 7c9f2c1..3758877 100644
--- a/backends/fs/windows/windows-fs.h
+++ b/backends/fs/windows/windows-fs.h
@@ -88,7 +88,7 @@ public:
virtual Common::SeekableReadStream *createReadStream();
virtual Common::WriteStream *createWriteStream();
- virtual bool create(bool isDirectory);
+ virtual bool create(bool isDirectoryFlag);
private:
/**
Commit: 2615e95768cb5155ba26027a7dc1189b54524d6e
https://github.com/scummvm/scummvm/commit/2615e95768cb5155ba26027a7dc1189b54524d6e
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-12T05:45:41Z
Commit Message:
WII: Fix Variable Shadowing Compiler Warnings.
Changed paths:
backends/fs/wii/wii-fs.cpp
backends/fs/wii/wii-fs.h
diff --git a/backends/fs/wii/wii-fs.cpp b/backends/fs/wii/wii-fs.cpp
index e036b75..c3fdbc0 100644
--- a/backends/fs/wii/wii-fs.cpp
+++ b/backends/fs/wii/wii-fs.cpp
@@ -213,7 +213,7 @@ Common::WriteStream *WiiFilesystemNode::createWriteStream() {
return StdioStream::makeFromPath(getPath(), true);
}
-bool WiiFilesystemNode::create(bool isDirectory) {
+bool WiiFilesystemNode::create(bool isDirectoryFlag) {
error("Not supported");
return false;
}
diff --git a/backends/fs/wii/wii-fs.h b/backends/fs/wii/wii-fs.h
index affb765..491c8d1 100644
--- a/backends/fs/wii/wii-fs.h
+++ b/backends/fs/wii/wii-fs.h
@@ -69,7 +69,7 @@ public:
virtual Common::SeekableReadStream *createReadStream();
virtual Common::WriteStream *createWriteStream();
- virtual bool create(bool isDirectory);
+ virtual bool create(bool isDirectoryFlag);
};
#endif
More information about the Scummvm-git-logs
mailing list