diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H index c0828badf36efbfeb3bbd1ac3f21aabfc27c8c39..754af386580f44c9ab36408a63bad6ab802ea9c1 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 d82d9b8247eb03ee79d7502d7fe20344420a1f9e..3c49f26c6444b6d4222cdd023978be70b87e3eb4 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) 2004-2010, 2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2010, 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 fb1a4d337ce83b004a122edd5381eee9d8827dda..335618019f14f2bd14f5bcd760fdc9fce7c5e135 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 4338a84bacae9762d82b3be86d0f1ba54d612fc4..3a31cfcbc581eb28dd7cef6f4c3a380a2ad9f6fe 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 ab5ada00e8d63b1a3fb2842b82d85eed842a6972..2c09d82b5ad011c809493c1e58839ae7483f87b6 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 32735d3f46818e3d5f58571671e9b5b43398eab4..600b4af7af59be44235b1618168c321fa46a3123 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) 2004-2011, 2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011, 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //