zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

masterOFstream: Rename private function to avoid clash with virtual function of same name

Browse Source
This commit is contained in:
Henry Weller
2017-07-07 21:04:03 +01:00
parent 5f1a8f824b
commit ab06d3f14e
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
View File

@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::masterOFstream::write
void Foam::masterOFstream::checkWrite
(
const fileName& fName,
const string& str
@ -43,11 +43,12 @@ void Foam::masterOFstream::write
OFstream os
(
fName,
IOstream::BINARY, //format(),
IOstream::BINARY,
version(),
compression_,
append_
);
if (!os.good())
{
FatalIOErrorInFunction(os)
@ -107,7 +108,7 @@ Foam::masterOFstream::~masterOFstream()
{
if (Pstream::master() && valid_)
{
write(pathName_, str());
checkWrite(pathName_, str());
}
return;
}
@ -136,7 +137,7 @@ Foam::masterOFstream::~masterOFstream()
{
if (valid[Pstream::myProcNo()])
{
write(filePaths[Pstream::myProcNo()], str());
checkWrite(filePaths[Pstream::myProcNo()], str());
}
}
@ -149,14 +150,18 @@ Foam::masterOFstream::~masterOFstream()
if (valid[proci])
{
write(filePaths[proci], string(buf.begin(), buf.size()));
checkWrite
(
filePaths[proci],
string(buf.begin(), buf.size())
);
}
}
}
}
else
{
write(pathName_, str());
checkWrite(pathName_, str());
}
}

3
src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
View File

@ -36,7 +36,6 @@ SourceFiles
#define masterOFstream_H
#include "OStringStream.H"
//#include "tmpNrc.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -66,7 +65,7 @@ class masterOFstream
// Private Member Functions
//- Open file with checking
void write(const fileName& fName, const string& str);
void checkWrite(const fileName& fName, const string& str);
public: