zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tmp: Limit the number of references to a temporary object to 2

Browse Source 
which reduces the number of potential problems with the reuse of
temporary objects.

In order to avoid unnecessary creation of tmp's referring to temporary
objects the assignment operator now transfers ownership of the object
and resets the argument.
This commit is contained in:
Henry Weller
2016-02-27 18:11:09 +00:00
parent 4a35943909
commit 51f93d3b43
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenFOAM/memory/tmp/tmp.H
View File

@ -70,6 +70,11 @@ class tmp
mutable T* ptr_;
// Private member operators
inline void operator++();
public:
// Constructors

24
src/OpenFOAM/memory/tmp/tmpI.H
View File

@ -26,6 +26,23 @@ License
#include "error.H"
#include <typeinfo>
// * * * * * * * * * * * * * Private Member Operators * * * * * * * * * * * //
template<class T>
inline void Foam::tmp<T>::operator++()
{
ptr_->operator++();
if (ptr_->count() > 1)
{
FatalErrorInFunction
<< "Attempt to create more than 2 tmp's referring to"
" the same object of type " << typeName()
<< abort(FatalError);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class T>
@ -62,7 +79,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
{
if (ptr_)
{
ptr_->operator++();
operator++();
}
else
{
@ -90,7 +107,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
}
else
{
ptr_->operator++();
operator++();
}
}
else
@ -342,8 +359,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
}
ptr_ = t.ptr_;
ptr_->operator++();
t.ptr_ = 0;
}
else
{