diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H index 9615ef1ee77d9c8009586924048f5cecfeeebc35..7a8a2cb863381370f059e6721bdfa035ea3fdf61 100644 --- a/src/OpenFOAM/containers/Lists/List/List.H +++ b/src/OpenFOAM/containers/Lists/List/List.H @@ -72,12 +72,9 @@ template<class T> class BiIndirectList; template<class T> Istream& operator>>(Istream& is, List<T>& list); // Common list types -typedef List<char> charList; -typedef List<label> labelList; - -//- A zero-sized list of labels -// \deprecated(2019-02) use labelList::null() instead -extern const labelList emptyLabelList; +typedef List<bool> boolList; //!< A List of bools +typedef List<char> charList; //!< A List of chars +typedef List<label> labelList; //!< A List of labels /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H index 93f3a560ea9ae88274e5e02a94f316c2f345c7a9..70d9ddb3b5147caade5b763a94b4794e87fcff42 100644 --- a/src/OpenFOAM/containers/Lists/SubList/SubList.H +++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2016 OpenFOAM Foundation @@ -53,7 +53,9 @@ namespace Foam template<class T> class SubList; // Common list types -typedef SubList<label> labelSubList; +typedef SubList<bool> boolSubList; //!< A SubList of bools +typedef SubList<char> charSubList; //!< A SubList of chars +typedef SubList<label> labelSubList; //!< A SubList of labels /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H index 27f38b87dbaf124f330c993ba13f423096fe7656..b7086b005ae17fb238e7e9e16b51deafe78a825d 100644 --- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H +++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H @@ -53,9 +53,9 @@ namespace Foam // Forward declarations template<class T> class UIndirectList; -// Commonly required list types -typedef UIndirectList<bool> boolUIndList; -typedef UIndirectList<label> labelUIndList; +// Common list types +typedef UIndirectList<bool> boolUIndList; //!< UIndirectList of bools +typedef UIndirectList<label> labelUIndList; //!< UIndirectList of labels /*---------------------------------------------------------------------------*\ Class UIndirectList Declaration diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H index 47ac45c8cce079eb50e6038233e3483eccfe2b2c..3e4ea24f36a2d597b54be91d0537fe7c6ac1197a 100644 --- a/src/OpenFOAM/containers/Lists/UList/UList.H +++ b/src/OpenFOAM/containers/Lists/UList/UList.H @@ -73,8 +73,9 @@ template<class T> Istream& operator>>(Istream&, UList<T>&); template<class T> Ostream& operator<<(Ostream&, const UList<T>&); // Common list types -typedef UList<char> charUList; -typedef UList<label> labelUList; +typedef UList<bool> boolUList; //!< A UList of bools +typedef UList<char> charUList; //!< A UList of chars +typedef UList<label> labelUList; //!< A UList of labels /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/primitives/bools/lists/boolList.H b/src/OpenFOAM/primitives/bools/lists/boolList.H index fab20dc32ae9ed40abe91d3dd68c2a83852a9235..e4f3ea3049cb0da5caff9b35d3eacbe9dbc3b1bf 100644 --- a/src/OpenFOAM/primitives/bools/lists/boolList.H +++ b/src/OpenFOAM/primitives/bools/lists/boolList.H @@ -23,18 +23,6 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. -Typedef - Foam::boolList - -Description - A List of bools. - -Typedef - Foam::boolUList - -Description - A UList of bools. - Typedef Foam::boolListList @@ -53,9 +41,10 @@ Description namespace Foam { - typedef UList<bool> boolUList; + // boolUlist = defined in UList.H + // boolList = defined in List.H + // boolSubList = defined in SubList.H - typedef List<bool> boolList; typedef List<List<bool>> boolListList; } diff --git a/src/OpenFOAM/primitives/ints/lists/labelList.C b/src/OpenFOAM/primitives/ints/lists/labelList.C index 175502437b7c12bfeaeeeaccc9f1b949a0ea48eb..7599aefa02ca5b3ac723ce8d66babcb9684abc16 100644 --- a/src/OpenFOAM/primitives/ints/lists/labelList.C +++ b/src/OpenFOAM/primitives/ints/lists/labelList.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "List.H" +#include "labelList.H" #include <numeric> // * * * * * * * * * * * * * * Global Data Members * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/ints/lists/labelList.H b/src/OpenFOAM/primitives/ints/lists/labelList.H index 9b22478fce8decf77a88677527ea50e67f4120c7..d50026e4d87430037f7680af0ccff2423e7d6320 100644 --- a/src/OpenFOAM/primitives/ints/lists/labelList.H +++ b/src/OpenFOAM/primitives/ints/lists/labelList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011 OpenFOAM Foundation @@ -23,24 +23,6 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. -Typedef - Foam::labelList - -Description - A List of labels. - -Typedef - Foam::labelSubList - -Description - A SubList of labels. - -Typedef - Foam::labelUList - -Description - A UList of labels. - Typedef Foam::labelListList @@ -72,6 +54,11 @@ namespace Foam typedef List<labelList> labelListList; typedef List<labelListList> labelListListList; + + + //- A zero-sized list of labels + // \deprecated(2019-02) use labelList::null() instead + extern const labelList emptyLabelList; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //