Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
5c220a9e2d
@ -1,2 +1,2 @@
|
||||
api=2004
|
||||
patch=200506
|
||||
patch=200604
|
||||
|
@ -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());
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user