diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H index 53fa27f1a7..729a13fedb 100644 --- a/src/OpenFOAM/memory/tmp/tmpI.H +++ b/src/OpenFOAM/memory/tmp/tmpI.H @@ -260,15 +260,16 @@ inline T& Foam::tmp::constCast() const template inline T* Foam::tmp::ptr() const { + if (!ptr_) + { + FatalErrorInFunction + << typeName() << " deallocated" + << abort(FatalError); + } + if (isTmp()) { - if (!ptr_) - { - FatalErrorInFunction - << typeName() << " deallocated" - << abort(FatalError); - } - else if (!ptr_->unique()) + if (!ptr_->unique()) { FatalErrorInFunction << "Attempt to acquire pointer to object referred to" diff --git a/src/OpenFOAM/memory/tmp/tmpNrcI.H b/src/OpenFOAM/memory/tmp/tmpNrcI.H index 19046f3c3f..36ec5e8b8a 100644 --- a/src/OpenFOAM/memory/tmp/tmpNrcI.H +++ b/src/OpenFOAM/memory/tmp/tmpNrcI.H @@ -224,15 +224,15 @@ inline T& Foam::tmpNrc::constCast() const template inline T* Foam::tmpNrc::ptr() const { + if (!ptr_) + { + FatalErrorInFunction + << typeName() << " deallocated" + << abort(FatalError); + } + if (isTmp()) { - if (!ptr_) - { - FatalErrorInFunction - << typeName() << " deallocated" - << abort(FatalError); - } - T* p = ptr_; ptr_ = nullptr;