Commit 44c73bfb authored by Henry Weller's avatar Henry Weller
Browse files

Made all template declarations consistent using 'class' rather than 'typename'

parent 055a113f
......@@ -45,8 +45,8 @@ namespace Foam
class phaseModel;
class phasePair;
template <class ThermoType> class pureMixture;
template <class ThermoType> class multiComponentMixture;
template<class ThermoType> class pureMixture;
template<class ThermoType> class multiComponentMixture;
/*---------------------------------------------------------------------------*\
Class InterfaceCompositionModel Declaration
......
......@@ -43,7 +43,7 @@ SourceFiles
namespace Foam
{
template <class modelType>
template<class modelType>
class BlendedInterfacialModel;
class blendingMethod;
......
......@@ -43,7 +43,7 @@ namespace Foam
{
class blendingMethod;
template <class modelType> class BlendedInterfacialModel;
template<class modelType> class BlendedInterfacialModel;
class heatTransferModel;
/*---------------------------------------------------------------------------*\
......
......@@ -47,7 +47,7 @@ SourceFiles
namespace Foam
{
template <class modelType>
template<class modelType>
class BlendedInterfacialModel;
class blendingMethod;
......
......@@ -57,7 +57,7 @@ namespace Foam
{
class blendingMethod;
template <class modelType> class BlendedInterfacialModel;
template<class modelType> class BlendedInterfacialModel;
class surfaceTensionModel;
class aspectRatioModel;
......@@ -320,11 +320,11 @@ public:
inline fv::options& fvOptions() const;
//- Access a sub model between a phase pair
template <class modelType>
template<class modelType>
const modelType& lookupSubModel(const phasePair& key) const;
//- Access a sub model between two phases
template <class modelType>
template<class modelType>
const modelType& lookupSubModel
(
const phaseModel& dispersed,
......
......@@ -182,7 +182,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
}
}
template <class modelType>
template<class modelType>
const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const
{
return
......@@ -193,7 +193,7 @@ const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const
}
template <class modelType>
template<class modelType>
const modelType& Foam::phaseSystem::lookupSubModel
(
const phaseModel& dispersed,
......
......@@ -54,7 +54,7 @@ class wallLubricationModel;
class turbulentDispersionModel;
class blendingMethod;
template <class modelType> class BlendedInterfacialModel;
template<class modelType> class BlendedInterfacialModel;
/*---------------------------------------------------------------------------*\
Class twoPhaseSystem Declaration
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -75,7 +75,7 @@ namespace DelaunayMeshTools
//- Write Delaunay points in the range between (and including)
// type startPointType and endPointType to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeOBJ
(
const fileName& fName,
......@@ -85,7 +85,7 @@ namespace DelaunayMeshTools
);
//- Write Delaunay points of type pointType to .obj file
template<typename Triangulation>
template<class Triangulation>
void writeOBJ
(
const fileName& fName,
......@@ -94,15 +94,15 @@ namespace DelaunayMeshTools
);
//- Write the fixed Delaunay points to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeFixedPoints(const fileName& fName, const Triangulation& t);
//- Write the boundary Delaunay points to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeBoundaryPoints(const fileName& fName, const Triangulation& t);
//- Write the processor interface to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeProcessorInterface
(
const fileName& fName,
......@@ -112,7 +112,7 @@ namespace DelaunayMeshTools
//- Write the internal Delaunay vertices of the tessellation as a
// pointField that may be used to restart the meshing process
template<typename Triangulation>
template<class Triangulation>
void writeInternalDelaunayVertices
(
const fileName& instance,
......@@ -121,14 +121,14 @@ namespace DelaunayMeshTools
//- Draws a tet cell to an output stream. The offset is supplied as the tet
// number to be drawn.
template<typename CellHandle>
template<class CellHandle>
void drawDelaunayCell(Ostream& os, const CellHandle& c, label offset = 0);
// Field extraction
//- Extract all points in vertex-index order
template<typename Triangulation>
template<class Triangulation>
tmp<pointField> allPoints(const Triangulation& t);
......
......@@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeOBJ
(
const fileName& fName,
......@@ -77,7 +77,7 @@ void Foam::DelaunayMeshTools::writeOBJ
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeOBJ
(
const fileName& fName,
......@@ -89,7 +89,7 @@ void Foam::DelaunayMeshTools::writeOBJ
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeFixedPoints
(
const fileName& fName,
......@@ -117,7 +117,7 @@ void Foam::DelaunayMeshTools::writeFixedPoints
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeBoundaryPoints
(
const fileName& fName,
......@@ -145,7 +145,7 @@ void Foam::DelaunayMeshTools::writeBoundaryPoints
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeProcessorInterface
(
const fileName& fName,
......@@ -175,7 +175,7 @@ void Foam::DelaunayMeshTools::writeProcessorInterface
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
(
const fileName& instance,
......@@ -224,7 +224,7 @@ void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
}
template<typename CellHandle>
template<class CellHandle>
void Foam::DelaunayMeshTools::drawDelaunayCell
(
Ostream& os,
......@@ -273,7 +273,7 @@ void Foam::DelaunayMeshTools::drawDelaunayCell
}
template<typename Triangulation>
template<class Triangulation>
Foam::tmp<Foam::pointField> Foam::DelaunayMeshTools::allPoints
(
const Triangulation& t
......
......@@ -225,7 +225,7 @@ public:
);
//- Distribute supplied the points to the appropriate processor
template<typename PointType>
template<class PointType>
autoPtr<mapDistribute> distributePoints(List<PointType>& points) const;
//- Is the given position inside the domain of this decomposition
......@@ -263,7 +263,7 @@ public:
) const;
//- What processor is the given position on?
template<typename PointType>
template<class PointType>
labelList processorPosition(const List<PointType>& pts) const;
//- What is the nearest processor to the given position?
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<typename PointType>
template<class PointType>
Foam::autoPtr<Foam::mapDistribute>
Foam::backgroundMeshDecomposition::distributePoints
(
......@@ -45,7 +45,7 @@ Foam::backgroundMeshDecomposition::distributePoints
}
template<typename PointType>
template<class PointType>
Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
(
const List<PointType>& pts
......
......@@ -119,7 +119,7 @@ public:
typedef typename Cb::Vertex_handle Vertex_handle;
typedef typename Cb::Cell_handle Cell_handle;
template<typename TDS2>
template<class TDS2>
struct Rebind_TDS
{
typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -29,7 +29,7 @@ License
#include "CGALTriangulation3DKernel.H"
template<typename Cell>
template<class Cell>
Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
(
Cell& c,
......@@ -74,7 +74,7 @@ Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
}
template<typename Cell>
template<class Cell>
bool Foam::foamyHexMeshChecks::closePoints
(
Cell& c,
......@@ -104,7 +104,7 @@ bool Foam::foamyHexMeshChecks::closePoints
}
template<typename Cell>
template<class Cell>
bool Foam::foamyHexMeshChecks::smallVolume
(
Cell& c,
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -34,21 +34,21 @@ namespace Foam
namespace foamyHexMeshChecks
{
template<typename Cell>
template<class Cell>
scalar coplanarTet
(
Cell& c,
const scalar tol = 1e-12
);
template<typename Cell>
template<class Cell>
bool closePoints
(
Cell& c,
const scalar tol = 1e-12
);
template<typename Cell>
template<class Cell>
bool smallVolume
(
Cell& c,
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -50,10 +50,10 @@ namespace indexedCellOps
{
//- Does the Dual vertex form part of a processor patch
template<typename CellType>
template<class CellType>
Foam::label dualVertexMasterProc(const CellType& c);
template<typename CellType>
template<class CellType>
Foam::FixedList<Foam::label, 4> processorsAttached(const CellType& c);
} // End namespace indexedCellOps
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<typename CellType>
template<class CellType>
Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
{
if (!c->parallelDualVertex())
......@@ -56,7 +56,7 @@ Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
}
template<typename CellType>
template<class CellType>
Foam::FixedList<Foam::label, 4>
CGAL::indexedCellOps::processorsAttached(const CellType& c)
{
......
......@@ -134,7 +134,7 @@ public:
typedef typename Tds::Vertex_handle Vertex_handle;
typedef typename Tds::Cell_handle Cell_handle;
template<typename TDS2>
template<class TDS2>
struct Rebind_TDS
{
typedef typename Vb::template Rebind_TDS<TDS2>::Other Vb2;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -50,11 +50,11 @@ namespace indexedVertexOps
//- Return the target cell size from that stored on a pair of Delaunay vertices,
// using a mean function.
template<typename VertexType>
template<class VertexType>
Foam::scalar averageCellSize(const VertexType& vA, const VertexType& vB);
template<typename VertexType>
template<class VertexType>
inline bool uninitialised(const VertexType& v);
} // End namespace indexedVertexOps
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<typename VertexType>
template<class VertexType>
Foam::scalar CGAL::indexedVertexOps::averageCellSize
(
const VertexType& vA,
......@@ -47,7 +47,7 @@ Foam::scalar CGAL::indexedVertexOps::averageCellSize
}
template<typename VertexType>
template<class VertexType>
inline bool CGAL::indexedVertexOps::uninitialised(const VertexType& v)
{
return v->type() == Foam::indexedVertexEnum::vtUnassigned;
......
......@@ -54,7 +54,7 @@ namespace Foam
#ifdef CGAL_INEXACT
template<typename Point>
template<class Point>
inline pointFromPoint topoint(const Point& P)
{
return reinterpret_cast<pointFromPoint>(P);
......@@ -67,7 +67,7 @@ namespace Foam
#else
template<typename Point>
template<class Point>
inline pointFromPoint topoint(const Point& P)
{
return Foam::point
......
Supports Markdown
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