Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Mark Olesen 2020-06-04 22:30:12 +02:00
commit 5c220a9e2d
2 changed files with 4 additions and 4 deletions

View File

@ -1,2 +1,2 @@
api=2004
patch=200506
patch=200604

View File

@ -121,21 +121,21 @@ inline void Foam::PtrList<T>::append(T* ptr)
template<class T>
inline void Foam::PtrList<T>::append(autoPtr<T>& aptr)
{
return UPtrList<T>::append(aptr.release());
UPtrList<T>::append(aptr.release());
}
template<class T>
inline void Foam::PtrList<T>::append(autoPtr<T>&& aptr)
{
return UPtrList<T>::append(aptr.release());
UPtrList<T>::append(aptr.release());
}
template<class T>
inline void Foam::PtrList<T>::append(const tmp<T>& tptr)
{
return UPtrList<T>::append(tptr.ptr());
UPtrList<T>::append(tptr.ptr());
}