research/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

masterUncollatedFileOperation: Renamed filePath to avoid conflict with virtual function

Browse source 
Avoids warning from clang
This commit is contained in:
Henry Weller 2017-07-07 14:09:18 +01:00
parent 7c301dbff4
commit 58ebb37b9b
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
View file

@ -90,7 +90,7 @@ Foam::fileOperations::masterUncollatedFileOperation::findInstancePath
} }
Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
( (
const bool checkGlobal, const bool checkGlobal,
const bool isFile, const bool isFile,
@ -707,7 +707,14 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
word newInstancePath; word newInstancePath;
if (Pstream::master()) if (Pstream::master())
{ {
objPath = filePath(checkGlobal, true, io, searchType, newInstancePath); objPath = filePathInfo
(
checkGlobal,
true,
io,
searchType,
newInstancePath
);
} }
{ {
label masterType(searchType); label masterType(searchType);
@ -777,7 +784,14 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
word newInstancePath; word newInstancePath;
if (Pstream::master()) if (Pstream::master())
{ {
objPath = filePath(checkGlobal, false, io, searchType, newInstancePath); objPath = filePathInfo
(
checkGlobal,
false,
io,
searchType,
newInstancePath
);
} }
{ {
label masterType(searchType); label masterType(searchType);

4
src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
View file

@ -366,10 +366,10 @@ protected:
const instant& t const instant& t
); );
//- Search for object; return info on how was found //- Search for object; return info on how it was found
// checkGlobal : also check undecomposed case // checkGlobal : also check undecomposed case
// isFile : true:check for file false:check for directory // isFile : true:check for file false:check for directory
fileName filePath fileName filePathInfo
( (
const bool checkGlobal, const bool checkGlobal,
const bool isFile, const bool isFile,