zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: remove spurious method declaration in regIOobject

Browse Source 
STYLE: adjust param/return for internal readStream method
This commit is contained in:
Mark Olesen
2021-11-17 11:08:20 +01:00
parent 92d52243af
commit bb771a3caf
4 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenFOAM/db/objectRegistry/objectRegistry.H
View File

@ -164,19 +164,19 @@ public:
// Access
//- Return the object registry
const objectRegistry& thisDb() const
const objectRegistry& thisDb() const noexcept
{
return *this;
}
//- Return time
const Time& time() const
//- Return time registry
const Time& time() const noexcept
{
return time_;
}
//- Return the parent objectRegistry
const objectRegistry& parent() const
const objectRegistry& parent() const noexcept
{
return parent_;
}

4
src/OpenFOAM/db/regIOobject/regIOobject.C
View File

@ -44,13 +44,13 @@ bool Foam::regIOobject::masterOnlyReading = false;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::regIOobject::regIOobject(const IOobject& io, const bool isTime)
Foam::regIOobject::regIOobject(const IOobject& io, const bool isTimeObject)
:
IOobject(io),
registered_(false),
ownedByRegistry_(false),
watchIndices_(),
eventNo_(isTime ? 0 : db().getEvent()), // No event for top-level Time
eventNo_(isTimeObject ? 0 : db().getEvent()), // No event for top-level Time
metaDataPtr_(nullptr),
isPtr_(nullptr)
{

10
src/OpenFOAM/db/regIOobject/regIOobject.H
View File

@ -84,10 +84,6 @@ protected:
const word& typeName
);
//- Construct and return an IFstream for the object.
// The results is NULL if the stream construction failed
Istream* objectStream();
//- To flag master-only reading of objects
static bool masterOnlyReading;
@ -117,8 +113,8 @@ private:
// Private Member Functions
//- Return Istream
Istream& readStream(const bool valid = true);
//- Construct object stream, read header if not already constructed
void readStream(const bool valid);
//- No copy assignment
void operator=(const regIOobject&) = delete;
@ -141,7 +137,7 @@ public:
//- Construct from IOobject. The optional flag adds special handling
//- if the object is the top-level regIOobject (eg, Time).
regIOobject(const IOobject& io, const bool isTime = false);
regIOobject(const IOobject& io, const bool isTimeObject = false);
//- Copy construct
regIOobject(const regIOobject& rio);

13
src/OpenFOAM/db/regIOobject/regIOobjectRead.C
View File

@ -86,17 +86,8 @@ bool Foam::regIOobject::readHeaderOk
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::Istream& Foam::regIOobject::readStream(const bool valid)
void Foam::regIOobject::readStream(const bool valid)
{
if (IFstream::debug)
{
Pout<< "regIOobject::readStream() : "
<< "reading object " << name()
<< " (global " << global() << ")"
<< " from file " << objectPath()
<< endl;
}
if (readOpt() == NO_READ)
{
FatalErrorInFunction
@ -131,8 +122,6 @@ Foam::Istream& Foam::regIOobject::readStream(const bool valid)
isPtr_ = fileHandler().readStream(*this, objPath, type(), valid);
}
return *isPtr_;
}