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

DEFEATURE: pointer dereferencing for HashTable iterator

Browse Source 
- this largely reverts 3f0f218d88 and 4ee65d12c4.

  Consistent addressing with support for wrapped pointer types (eg,
  autoPtr, std::unique_ptr) has proven to be less robust than desired.
  Thus rescind HashTable iterator '->' dereferencing (from APR-2019).
This commit is contained in:
Mark Olesen
2019-09-27 19:45:54 +02:00
committed by Andrew Heather
parent fc461a1cc6
commit b6bf9129f6
20 changed files with 112 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
View File

@ -170,17 +170,10 @@ public:
//- The third template parameter, the hash index method.
typedef Hash hasher;
//- The type used for storing into value_type objects.
// This type is usually 'value_type*'.
typedef T* pointer;
//- The type used for storing into value_type objects.
// This type is usually 'value_type&'.
typedef T& reference;
//- The type used for reading from constant value_type objects.
typedef const T* const_pointer;
//- The type used for reading from constant value_type objects.
typedef const T& const_reference;
@ -695,7 +688,6 @@ public:
using key_type = this_type::key_type;
using mapped_type = this_type::mapped_type;
using value_type = this_type::value_type;
using pointer = this_type::pointer;
using reference = this_type::reference;
// Constructors
@ -722,22 +714,6 @@ public:
inline reference operator*() const { return this->val(); }
inline reference operator()() const { return this->val(); }
//- Direct pointer dereferencing (pointer types)
template<class TypeT = T>
typename std::enable_if
<
Detail::isPointer<TypeT>::value,
T
>::type operator->() const { return this->val(); }
//- Address of iterated value (non-pointer types)
template<class TypeT = T>
typename std::enable_if
<
!Detail::isPointer<TypeT>::value,
T*
>::type operator->() const { return &(this->val()); }
inline iterator& operator++();
inline iterator operator++(int);
};
@ -758,7 +734,6 @@ public:
using key_type = this_type::key_type;
using mapped_type = const this_type::mapped_type;
using value_type = const this_type::value_type;
using pointer = this_type::const_pointer;
using reference = this_type::const_reference;
// Constructors
@ -800,26 +775,9 @@ public:
inline reference operator*() const { return this->val(); }
inline reference operator()() const { return this->val(); }
//- Direct pointer dereferencing (pointer types)
template<class TypeT = T>
typename std::enable_if
<
Detail::isPointer<TypeT>::value,
const T
>::type operator->() const { return this->val(); }
//- Address of iterated value (non-pointer types)
template<class TypeT = T>
typename std::enable_if
<
!Detail::isPointer<TypeT>::value,
const T*
>::type operator->() const { return &(this->val()); }
inline const_iterator& operator++();
inline const_iterator operator++(int);
// Assignment
const_iterator& operator=(const const_iterator&) = default;
@ -845,7 +803,6 @@ public:
{
public:
using value_type = this_type::key_type;
using pointer = const Key*;
using reference = const Key&;
//- Implicit conversion

2
src/OpenFOAM/db/IOobjectList/IOobjectListTemplates.C
View File

@ -640,7 +640,7 @@ Foam::label Foam::IOobjectList::filterClasses
// Matches? either prune (pruning) or keep (!pruning)
if
(
(pred(iter->headerClassName()) ? pruning : !pruning)
(pred(iter.val()->headerClassName()) ? pruning : !pruning)
&& erase(iter)
)
{

14
src/OpenFOAM/db/objectRegistry/objectRegistry.C
View File

@ -437,7 +437,7 @@ bool Foam::objectRegistry::modified() const
{
for (const_iterator iter = cbegin(); iter != cend(); ++iter)
{
if (iter->modified())
if ((*iter)->modified())
{
return true;
}
@ -458,7 +458,7 @@ void Foam::objectRegistry::readModifiedObjects()
<< iter.key() << endl;
}
iter->readIfModified();
(*iter)->readIfModified();
}
}
@ -487,15 +487,15 @@ bool Foam::objectRegistry::writeObject
Pout<< "objectRegistry::write() : "
<< name() << " : Considering writing object "
<< iter.key()
<< " of type " << iter->type()
<< " with writeOpt " << static_cast<int>(iter->writeOpt())
<< " to file " << iter->objectPath()
<< " of type " << (*iter)->type()
<< " with writeOpt " << static_cast<int>((*iter)->writeOpt())
<< " to file " << (*iter)->objectPath()
<< endl;
}
if (iter->writeOpt() != NO_WRITE)
if ((*iter)->writeOpt() != NO_WRITE)
{
ok = iter->writeObject(fmt, ver, cmp, valid) && ok;
ok = (*iter)->writeObject(fmt, ver, cmp, valid) && ok;
}
}

2
src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
View File

@ -451,7 +451,7 @@ const Type& Foam::objectRegistry::lookupObject
<< " lookup of " << name << " from objectRegistry "
<< this->name()
<< " successful\n but it is not a " << Type::typeName
<< ", it is a " << iter->type()
<< ", it is a " << (*iter)->type()
<< abort(FatalError);
}
else if (recursive && this->parentNotTime())

12
src/OpenFOAM/meshes/MeshObject/MeshObject.C
View File

@ -125,7 +125,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
{
if (meshObject::debug)
{
Pout<< " Moving " << iter->name() << endl;
Pout<< " Moving " << (*iter)->name() << endl;
}
objectPtr->movePoints();
}
@ -133,7 +133,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
{
if (meshObject::debug)
{
Pout<< " Destroying " << iter->name() << endl;
Pout<< " Destroying " << (*iter)->name() << endl;
}
obr.checkOut(*iter);
}
@ -165,7 +165,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
{
if (meshObject::debug)
{
Pout<< " Updating " << iter->name() << endl;
Pout<< " Updating " << (*iter)->name() << endl;
}
objectPtr->updateMesh(mpm);
}
@ -173,7 +173,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
{
if (meshObject::debug)
{
Pout<< " Destroying " << iter->name() << endl;
Pout<< " Destroying " << (*iter)->name() << endl;
}
obr.checkOut(*iter);
}
@ -200,7 +200,7 @@ void Foam::meshObject::clear(objectRegistry& obr)
{
if (meshObject::debug)
{
Pout<< " Destroying " << iter->name() << endl;
Pout<< " Destroying " << (*iter)->name() << endl;
}
obr.checkOut(*iter);
}
@ -236,7 +236,7 @@ void Foam::meshObject::clearUpto(objectRegistry& obr)
{
if (meshObject::debug)
{
Pout<< " Destroying " << iter->name() << endl;
Pout<< " Destroying " << (*iter)->name() << endl;
}
obr.checkOut(*iter);
}

30
src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
View File

@ -517,27 +517,27 @@ void Foam::genericFaPatchField<Type>::autoMap
forAllIters(scalarFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(vectorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(sphTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(symmTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(tensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
}
@ -560,7 +560,7 @@ void Foam::genericFaPatchField<Type>::rmap
if (iter.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -570,7 +570,7 @@ void Foam::genericFaPatchField<Type>::rmap
if (iter.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -580,7 +580,7 @@ void Foam::genericFaPatchField<Type>::rmap
if (iter.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -590,7 +590,7 @@ void Foam::genericFaPatchField<Type>::rmap
if (iter.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -600,7 +600,7 @@ void Foam::genericFaPatchField<Type>::rmap
if (iter.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
}
@ -713,23 +713,23 @@ void Foam::genericFaPatchField<Type>::write(Ostream& os) const
{
if (scalarFields_.found(key))
{
scalarFields_.cfind(key)->writeEntry(key, os);
scalarFields_.cfind(key)()->writeEntry(key, os);
}
else if (vectorFields_.found(key))
{
vectorFields_.cfind(key)->writeEntry(key, os);
vectorFields_.cfind(key)()->writeEntry(key, os);
}
else if (sphTensorFields_.found(key))
{
sphTensorFields_.cfind(key)->writeEntry(key, os);
sphTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (symmTensorFields_.found(key))
{
symmTensorFields_.cfind(key)->writeEntry(key, os);
symmTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (tensorFields_.found(key))
{
tensorFields_.cfind(key)->writeEntry(key, os);
tensorFields_.cfind(key)()->writeEntry(key, os);
}
}
else

30
src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
View File

@ -517,27 +517,27 @@ void Foam::genericFvPatchField<Type>::autoMap
forAllIters(scalarFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(vectorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(sphTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(symmTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(tensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
}
@ -560,7 +560,7 @@ void Foam::genericFvPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -570,7 +570,7 @@ void Foam::genericFvPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -580,7 +580,7 @@ void Foam::genericFvPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -590,7 +590,7 @@ void Foam::genericFvPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -600,7 +600,7 @@ void Foam::genericFvPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
}
@ -713,23 +713,23 @@ void Foam::genericFvPatchField<Type>::write(Ostream& os) const
{
if (scalarFields_.found(key))
{
scalarFields_.cfind(key)->writeEntry(key, os);
scalarFields_.cfind(key)()->writeEntry(key, os);
}
else if (vectorFields_.found(key))
{
vectorFields_.cfind(key)->writeEntry(key, os);
vectorFields_.cfind(key)()->writeEntry(key, os);
}
else if (sphTensorFields_.found(key))
{
sphTensorFields_.cfind(key)->writeEntry(key, os);
sphTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (symmTensorFields_.found(key))
{
symmTensorFields_.cfind(key)->writeEntry(key, os);
symmTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (tensorFields_.found(key))
{
tensorFields_.cfind(key)->writeEntry(key, os);
tensorFields_.cfind(key)()->writeEntry(key, os);
}
}
else

30
src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
View File

@ -515,27 +515,27 @@ void Foam::genericFvsPatchField<Type>::autoMap
forAllIters(scalarFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(vectorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(sphTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(symmTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(tensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
}
@ -558,7 +558,7 @@ void Foam::genericFvsPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -568,7 +568,7 @@ void Foam::genericFvsPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -578,7 +578,7 @@ void Foam::genericFvsPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -588,7 +588,7 @@ void Foam::genericFvsPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -598,7 +598,7 @@ void Foam::genericFvsPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
}
@ -711,23 +711,23 @@ void Foam::genericFvsPatchField<Type>::write(Ostream& os) const
{
if (scalarFields_.found(key))
{
scalarFields_.cfind(key)->writeEntry(key, os);
scalarFields_.cfind(key)()->writeEntry(key, os);
}
else if (vectorFields_.found(key))
{
vectorFields_.cfind(key)->writeEntry(key, os);
vectorFields_.cfind(key)()->writeEntry(key, os);
}
else if (sphTensorFields_.found(key))
{
sphTensorFields_.cfind(key)->writeEntry(key, os);
sphTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (symmTensorFields_.found(key))
{
symmTensorFields_.cfind(key)->writeEntry(key, os);
symmTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (tensorFields_.found(key))
{
tensorFields_.cfind(key)->writeEntry(key, os);
tensorFields_.cfind(key)()->writeEntry(key, os);
}
}
else

30
src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
View File

@ -377,27 +377,27 @@ void Foam::genericPointPatchField<Type>::autoMap
{
forAllIters(scalarFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(vectorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(sphTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(symmTensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
forAllIters(tensorFields_, iter)
{
iter->autoMap(m);
(*iter)->autoMap(m);
}
}
@ -418,7 +418,7 @@ void Foam::genericPointPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -428,7 +428,7 @@ void Foam::genericPointPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -438,7 +438,7 @@ void Foam::genericPointPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -448,7 +448,7 @@ void Foam::genericPointPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
@ -458,7 +458,7 @@ void Foam::genericPointPatchField<Type>::rmap
if (iter2.found())
{
iter->rmap(*iter2(), addr);
(*iter)->rmap(*iter2(), addr);
}
}
}
@ -494,23 +494,23 @@ void Foam::genericPointPatchField<Type>::write(Ostream& os) const
{
if (scalarFields_.found(key))
{
scalarFields_.cfind(key)->writeEntry(key, os);
scalarFields_.cfind(key)()->writeEntry(key, os);
}
else if (vectorFields_.found(key))
{
vectorFields_.cfind(key)->writeEntry(key, os);
vectorFields_.cfind(key)()->writeEntry(key, os);
}
else if (sphTensorFields_.found(key))
{
sphTensorFields_.cfind(key)->writeEntry(key, os);
sphTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (symmTensorFields_.found(key))
{
symmTensorFields_.cfind(key)->writeEntry(key, os);
symmTensorFields_.cfind(key)()->writeEntry(key, os);
}
else if (tensorFields_.found(key))
{
tensorFields_.cfind(key)->writeEntry(key, os);
tensorFields_.cfind(key)()->writeEntry(key, os);
}
}
else