Commit 27c58dde authored by Mark Olesen's avatar Mark Olesen Committed by Andrew Heather
Browse files

STYLE: provide boolList, boolUList typedefs directly in container

- move declaration of emptyLabelList (now deprecated) out of List.H
parent 7904e4a7
......@@ -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
/*---------------------------------------------------------------------------*\
......
......@@ -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
/*---------------------------------------------------------------------------*\
......
......@@ -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
......
......@@ -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
/*---------------------------------------------------------------------------*\
......
......@@ -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;
}
......
......@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "List.H"
#include "labelList.H"
#include <numeric>
// * * * * * * * * * * * * * * Global Data Members * * * * * * * * * * * * * //
......
......@@ -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;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment