[Scummvm-git-logs] scummvm master -> 843e0f6a4b23e5d92b38d8a358331491b6f003b5

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
843e0f6a4b POSIX: Fix compiler warning


Commit: 843e0f6a4b23e5d92b38d8a358331491b6f003b5
    https://github.com/scummvm/scummvm/commit/843e0f6a4b23e5d92b38d8a358331491b6f003b5
Author: jepael (jepael at users.noreply.github.com)
Date: 2019-11-09T16:36:30+01:00

Commit Message:
POSIX: Fix compiler warning

Changed paths:
    backends/fs/posix-drives/posix-drives-fs.cpp
    backends/fs/posix-drives/posix-drives-fs.h


diff --git a/backends/fs/posix-drives/posix-drives-fs.cpp b/backends/fs/posix-drives/posix-drives-fs.cpp
index d48792e..c37492e 100644
--- a/backends/fs/posix-drives/posix-drives-fs.cpp
+++ b/backends/fs/posix-drives/posix-drives-fs.cpp
@@ -53,7 +53,7 @@ DrivePOSIXFilesystemNode::DrivePOSIXFilesystemNode(const DrivesArray &drives) :
 	_isValid = false;
 }
 
-DrivePOSIXFilesystemNode *DrivePOSIXFilesystemNode::getChildWithKnownType(const Common::String &n, bool isDirectory) const {
+DrivePOSIXFilesystemNode *DrivePOSIXFilesystemNode::getChildWithKnownType(const Common::String &n, bool isDirectoryFlag) const {
 	assert(_isDirectory);
 
 	// Make sure the string contains no slashes
@@ -68,7 +68,7 @@ DrivePOSIXFilesystemNode *DrivePOSIXFilesystemNode::getChildWithKnownType(const
 	child->_path = newPath;
 	child->_isValid = true;
 	child->_isPseudoRoot = false;
-	child->_isDirectory = isDirectory;
+	child->_isDirectory = isDirectoryFlag;
 	child->_displayName = n;
 
 	return child;
diff --git a/backends/fs/posix-drives/posix-drives-fs.h b/backends/fs/posix-drives/posix-drives-fs.h
index 04d21b4..4c022b7 100644
--- a/backends/fs/posix-drives/posix-drives-fs.h
+++ b/backends/fs/posix-drives/posix-drives-fs.h
@@ -50,7 +50,7 @@ private:
 	bool _isPseudoRoot;
 	const DrivesArray &_drives;
 
-	DrivePOSIXFilesystemNode *getChildWithKnownType(const Common::String &n, bool isDirectory) const;
+	DrivePOSIXFilesystemNode *getChildWithKnownType(const Common::String &n, bool isDirectoryFlag) const;
 	bool isDrive(const Common::String &path) const;
 };