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

fixed stupid replacement error introduced by 0bada1e31b

Browse Source
This commit is contained in:
Mark Olesen
2009-03-24 13:41:35 +01:00
parent 852d9f3298
commit cb96ef9a30
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,7 +529,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
} }
else else
{ {
IOWarningIn("dictionary::add(entry*)", (*this)) IOWarningIn("dictionary::add(entry*, bool)", (*this))
<< "problem replacing entry "<< entryPtr->keyword() << "problem replacing entry "<< entryPtr->keyword()
<< " in dictionary " << name() << endl; << " in dictionary " << name() << endl;
@ -558,7 +558,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
} }
else else
{ {
IOWarningIn("dictionary::add(entry* entryPtr)", (*this)) IOWarningIn("dictionary::add(entry*, bool)", (*this))
<< "attempt to add entry "<< entryPtr->keyword() << "attempt to add entry "<< entryPtr->keyword()
<< " which already exists in dictionary " << name() << " which already exists in dictionary " << name()
<< endl; << endl;
@ -574,11 +574,13 @@ void Foam::dictionary::add(const entry& e, bool mergeEntry)
add(e.clone(*this).ptr(), mergeEntry); add(e.clone(*this).ptr(), mergeEntry);
} }
void Foam::dictionary::add(const keyType& k, const word& w, bool overwrite) void Foam::dictionary::add(const keyType& k, const word& w, bool overwrite)
{ {
add(new primitiveEntry(k, token(w)), overwrite); add(new primitiveEntry(k, token(w)), overwrite);
} }
void Foam::dictionary::add void Foam::dictionary::add
( (
const keyType& k, const keyType& k,
@ -589,16 +591,19 @@ void Foam::dictionary::add
add(new primitiveEntry(k, token(s)), overwrite); add(new primitiveEntry(k, token(s)), overwrite);
} }
void Foam::dictionary::add(const keyType& k, const label l, bool overwrite) void Foam::dictionary::add(const keyType& k, const label l, bool overwrite)
{ {
add(new primitiveEntry(k, token(l)), overwrite); add(new primitiveEntry(k, token(l)), overwrite);
} }
void Foam::dictionary::add(const keyType& k, const scalar s, bool overwrite) void Foam::dictionary::add(const keyType& k, const scalar s, bool overwrite)
{ {
add(new primitiveEntry(k, token(s)), overwrite); add(new primitiveEntry(k, token(s)), overwrite);
} }
void Foam::dictionary::add void Foam::dictionary::add
( (
const keyType& k, const keyType& k,
@ -628,6 +633,7 @@ void Foam::dictionary::set(const entry& e)
set(e.clone(*this).ptr()); set(e.clone(*this).ptr());
} }
void Foam::dictionary::set(const keyType& k, const dictionary& d) void Foam::dictionary::set(const keyType& k, const dictionary& d)
{ {
set(new dictionaryEntry(k, *this, d)); set(new dictionaryEntry(k, *this, d));
@ -770,7 +776,7 @@ bool Foam::dictionary::merge(const dictionary& dict)
bool changed = false; bool changed = false;
forAllConstIter(IDLList<entry>, *this, iter) forAllConstIter(IDLList<entry>, dict, iter)
{ {
HashTable<entry*>::iterator fnd = hashedEntries_.find(iter().keyword()); HashTable<entry*>::iterator fnd = hashedEntries_.find(iter().keyword());