made container constructors explicit

This commit is contained in:
mattijs
2009-11-03 18:09:52 +00:00
parent 1d6268f24a
commit 151f30e779
15 changed files with 61 additions and 36 deletions

View File

@ -85,7 +85,8 @@ const Foam::label edgesArray[12][2] =
const Foam::edgeList Foam::treeBoundBox::edges
(
initListList<edge, label, 12, 2>(edgesArray)
//initListList<edge, label, 12, 2>(edgesArray)
calcEdges(edgesArray)
);
@ -97,6 +98,18 @@ const Foam::FixedList<Foam::vector, 6> Foam::treeBoundBox::faceNormals
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::edgeList Foam::treeBoundBox::calcEdges(const label edgesArray[12][2])
{
edgeList edges(12);
forAll(edges, edgeI)
{
edges[edgeI][0] = edgesArray[edgeI][0];
edges[edgeI][1] = edgesArray[edgeI][1];
}
return edges;
}
Foam::FixedList<Foam::vector, 6> Foam::treeBoundBox::calcFaceNormals()
{
FixedList<vector, 6> normals;

View File

@ -80,6 +80,9 @@ class treeBoundBox
private:
//- To initialise edges.
static edgeList calcEdges(const label[12][2]);
//- To initialise faceNormals.
static FixedList<vector, 6> calcFaceNormals();

View File

@ -464,7 +464,10 @@ void Foam::searchableSurfaceCollection::getRegion
labelList surfRegion;
subGeom_[surfI].getRegion
(
UIndirectList<pointIndexHit>(info, indices),
List<pointIndexHit>
(
UIndirectList<pointIndexHit>(info, indices)
),
surfRegion
);
forAll(indices, i)
@ -528,7 +531,10 @@ void Foam::searchableSurfaceCollection::getNormal
vectorField surfNormal;
subGeom_[surfI].getNormal
(
UIndirectList<pointIndexHit>(info, indices),
List<pointIndexHit>
(
UIndirectList<pointIndexHit>(info, indices)
),
surfNormal
);
forAll(indices, i)