diff --git a/src/OpenFOAM/containers/LinkedLists/user/DLList.H b/src/OpenFOAM/containers/LinkedLists/user/DLList.H index 344f4cc96..52b96a31c 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/DLList.H +++ b/src/OpenFOAM/containers/LinkedLists/user/DLList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,7 +21,7 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class +Alias Foam::DLList Description @@ -39,42 +39,9 @@ Description namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class DLList Declaration -\*---------------------------------------------------------------------------*/ - -template -class DLList -: - public LList -{ - -public: - - // Constructors - - //- Null construct - DLList() - {} - - //- Construct given initial T - DLList(T a) - : - LList(a) - {} - - //- Construct from Istream - DLList(Istream& is) - : - LList(is) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + template + using DLList = LList; +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H b/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H index 9793d8be9..40a15d247 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H +++ b/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,7 +21,7 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class +Alias Foam::DLPtrList Description @@ -39,43 +39,9 @@ Description namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class DLPtrList Declaration -\*---------------------------------------------------------------------------*/ - -template -class DLPtrList -: - public LPtrList -{ - -public: - - // Constructors - - //- Null construct - DLPtrList() - {} - - //- Construct from Istream using given Istream constructor class - template - DLPtrList(Istream& is, const INew& inewt) - : - LPtrList(is, inewt) - {} - - //- Construct from Istream - DLPtrList(Istream& is) - : - LPtrList(is) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + template + using DLPtrList = LPtrList; +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H b/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H index 195cd4517..e7331d0a8 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H +++ b/src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,21 +58,8 @@ public: // Constructors - //- Construct null - FIFOStack() - {} - - //- Construct given initial T - FIFOStack(T a) - : - SLList(a) - {} - - //- Construct from Istream - FIFOStack(Istream& is) - : - SLList(is) - {} + //- Inherit constructors from SLList + using SLList::SLList; // Member Functions diff --git a/src/OpenFOAM/containers/LinkedLists/user/IDLList.H b/src/OpenFOAM/containers/LinkedLists/user/IDLList.H index 6e31ed7fc..75d69c66a 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/IDLList.H +++ b/src/OpenFOAM/containers/LinkedLists/user/IDLList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,7 +21,7 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class +Alias Foam::IDLList Description @@ -39,56 +39,9 @@ Description namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class IDLList Declaration -\*---------------------------------------------------------------------------*/ - -template -class IDLList -: - public ILList -{ - -public: - - // Constructors - - //- Null construct - IDLList() - {} - - //- Construct given initial T - IDLList(const T& a) - : - ILList(a) - {} - - //- Construct from Istream using given Istream constructor class - template - IDLList(Istream& is, const INew& inewt) - : - ILList(is, inewt) - {} - - //- Construct from Istream - IDLList(Istream& is) - : - ILList(is) - {} - - //- Copy constructor with additional argument for clone - template - IDLList(const IDLList& idll, const CloneArg& cloneArg) - : - ILList(idll, cloneArg) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + template + using IDLList = ILList; +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/LinkedLists/user/ISLList.H b/src/OpenFOAM/containers/LinkedLists/user/ISLList.H index 840c0e369..4d62f8d80 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/ISLList.H +++ b/src/OpenFOAM/containers/LinkedLists/user/ISLList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,7 +21,7 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class +Alias Foam::ISLList Description @@ -39,52 +39,8 @@ Description namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class ISLList Declaration -\*---------------------------------------------------------------------------*/ - -template -class ISLList -: - public ILList -{ - -public: - - // Constructors - - //- Null construct - ISLList() - {} - - //- Construct given initial T - ISLList(const T& a) - : - ILList(a) - {} - - //- Construct from Istream using given Istream constructor class - template - ISLList(Istream& is, const INew& inewt) - : - ILList(is, inewt) - {} - - //- Construct from Istream - ISLList(Istream& is) - : - ILList(is) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif + template + using ISLList = ILList; +} // ************************************************************************* // diff --git a/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H b/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H index 884f7151e..03135735d 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H +++ b/src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,21 +58,8 @@ public: // Constructors - //- Construct null - LIFOStack() - {} - - //- Construct given initial T - LIFOStack(T a) - : - SLList(a) - {} - - //- Construct from Istream - LIFOStack(Istream& is) - : - SLList(is) - {} + //- Inherit constructors from SLList + using SLList::SLList; // Member Functions diff --git a/src/OpenFOAM/containers/LinkedLists/user/SLPtrList.H b/src/OpenFOAM/containers/LinkedLists/user/SLPtrList.H index dc14bd776..fb9bb05cd 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/SLPtrList.H +++ b/src/OpenFOAM/containers/LinkedLists/user/SLPtrList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,7 +21,7 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class +Alias Foam::SLPtrList Description @@ -39,49 +39,9 @@ Description namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class SLPtrList Declaration -\*---------------------------------------------------------------------------*/ - -template -class SLPtrList -: - public LPtrList -{ - -public: - - // Constructors - - //- Null construct - SLPtrList() - {} - - //- Construct given initial T* - SLPtrList(T* a) - : - LPtrList(a) - {} - - //- Construct from Istream using given Istream constructor class - template - SLPtrList(Istream& is, const INew& inewt) - : - LPtrList(is, inewt) - {} - - //- Construct from Istream - SLPtrList(Istream& is) - : - LPtrList(is) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + template + using SLPtrList = LPtrList; +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/LinkedLists/user/UIDLList.H b/src/OpenFOAM/containers/LinkedLists/user/UIDLList.H index 42f44b727..47204dce0 100644 --- a/src/OpenFOAM/containers/LinkedLists/user/UIDLList.H +++ b/src/OpenFOAM/containers/LinkedLists/user/UIDLList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,7 +21,7 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class +Alias Foam::UIDLList Description @@ -39,42 +39,9 @@ Description namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class UIDLList Declaration -\*---------------------------------------------------------------------------*/ - -template -class UIDLList -: - public UILList -{ - -public: - - // Constructors - - //- Null construct - UIDLList() - {} - - //- Construct given initial T - UIDLList(T a) - : - UILList(a) - {} - - //- Construct from Istream - UIDLList(Istream& is) - : - UILList(is) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + template + using UIDLList = UILList; +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H index 9d7e7fd5c..a59a2a4e7 100644 --- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H +++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H @@ -50,10 +50,14 @@ namespace Foam // Forward declaration of classes -template class SLPtrList; template class autoPtr; template class tmp; +class SLListBase; +template class LPtrList; +template +using SLPtrList = LPtrList; + // Forward declaration of friend functions and operators template class PtrList;