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

dictionary: Removed the move constructor and assignment operator

Browse Source 
because they cannot update the parent dictionary reference.
This commit is contained in:
Henry Weller
2024-05-28 20:39:16 +01:00
parent dbb6837e47
commit 33ad682c38
2 changed files with 2 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/OpenFOAM/db/dictionary/dictionary.C
View File

@ -365,6 +365,8 @@ Foam::dictionary::dictionary
IDLList<entry>(dict, *this),
parent_(dictionary::null)
{
std::cerr<< "dictionary::dictionary " << dict.name() << std::endl;
forAllIter(IDLList<entry>, *this, iter)
{
hashedEntries_.insert(iter().keyword(), &iter());
@ -381,20 +383,6 @@ Foam::dictionary::dictionary
}
Foam::dictionary::dictionary
(
dictionary&& dict
)
:
dictionaryName(move(dict.name())),
IDLList<entry>(move(dict)),
hashedEntries_(move(dict.hashedEntries_)),
parent_(dict.parent_),
patternEntries_(move(dict.patternEntries_)),
patternRegexps_(move(dict.patternRegexps_))
{}
Foam::dictionary::dictionary
(
const dictionary* dictPtr
@ -409,26 +397,6 @@ Foam::dictionary::dictionary
}
Foam::dictionary::dictionary
(
const dictionary& parentDict,
dictionary&& dict
)
:
dictionaryName(move(dict.name())),
IDLList<entry>(move(dict)),
hashedEntries_(move(dict.hashedEntries_)),
parent_(parentDict),
patternEntries_(move(dict.patternEntries_)),
patternRegexps_(move(dict.patternRegexps_))
{
if (parentDict.name() != fileName::null)
{
name() = parentDict.name()/name();
}
}
Foam::autoPtr<Foam::dictionary> Foam::dictionary::clone() const
{
return autoPtr<dictionary>(new dictionary(*this));
@ -1428,24 +1396,6 @@ void Foam::dictionary::operator=(const dictionary& rhs)
}
void Foam::dictionary::operator=(dictionary&& rhs)
{
// Check for assignment to self
if (this == &rhs)
{
FatalIOErrorInFunction(*this)
<< "attempted assignment to self for dictionary " << name()
<< abort(FatalIOError);
}
dictionaryName::operator=(move(rhs));
IDLList<entry>::operator=(move(rhs));
hashedEntries_ = move(rhs.hashedEntries_);
patternEntries_ = move(rhs.patternEntries_);
patternRegexps_ = move(rhs.patternRegexps_);
}
void Foam::dictionary::operator+=(const dictionary& rhs)
{
// Check for assignment to self

9
src/OpenFOAM/db/dictionary/dictionary.H
View File

@ -313,13 +313,6 @@ public:
// A null pointer is treated like an empty dictionary.
dictionary(const dictionary*);
//- Move constructor transferring parameter contents
// given parent dictionary
dictionary(const dictionary& parentDict, dictionary&&);
//- Move constructor
dictionary(dictionary&&);
//- Construct and return clone
autoPtr<dictionary> clone() const;
@ -808,8 +801,6 @@ public:
void operator=(const dictionary&);
void operator=(dictionary&&);
//- Include entries from the given dictionary.
// Warn, but do not overwrite existing entries.
void operator+=(const dictionary&);