zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates for clang++-3.9

Browse Source
This commit is contained in:
Henry Weller
2017-01-18 21:45:26 +00:00
parent 1d8b31d390
commit c7300716f6
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/conversion/ensight/part/ensightPartCells.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,6 +38,8 @@ namespace Foam
addToRunTimeSelectionTable(ensightPart, ensightPartCells, istream); addToRunTimeSelectionTable(ensightPart, ensightPartCells, istream);
} }
const Foam::polyMesh* const Foam::ensightPartCells::polyMeshNullPtr_ = nullptr;
const Foam::List<Foam::word> Foam::ensightPartCells::elemTypes_ const Foam::List<Foam::word> Foam::ensightPartCells::elemTypes_
( (
IStringStream IStringStream
@ -182,7 +184,7 @@ Foam::ensightPartCells::ensightPartCells
) )
: :
ensightPart(partNumber, partDescription), ensightPart(partNumber, partDescription),
mesh_(*reinterpret_cast<polyMesh*>(0)) mesh_(*polyMeshNullPtr_)
{} {}
@ -237,7 +239,7 @@ Foam::ensightPartCells::ensightPartCells(const ensightPartCells& part)
Foam::ensightPartCells::ensightPartCells(Istream& is) Foam::ensightPartCells::ensightPartCells(Istream& is)
: :
ensightPart(), ensightPart(),
mesh_(*reinterpret_cast<polyMesh*>(0)) mesh_(*polyMeshNullPtr_)
{ {
reconstruct(is); reconstruct(is);
} }

4
src/conversion/ensight/part/ensightPartCells.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -94,6 +94,8 @@ protected:
// Static data members // Static data members
static const polyMesh* const polyMeshNullPtr_;
static const List<word> elemTypes_; static const List<word> elemTypes_;

15
src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,13 +28,16 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const Foam::primitiveMesh* const Foam::edgeFaceCirculator::endConstIterMeshPtr
= nullptr;
const Foam::edgeFaceCirculator Foam::edgeFaceCirculator::endConstIter const Foam::edgeFaceCirculator Foam::edgeFaceCirculator::endConstIter
( (
*reinterpret_cast<primitiveMesh*>(0), // primitiveMesh *Foam::edgeFaceCirculator::endConstIterMeshPtr, // primitiveMesh
-1, // faceLabel -1, // faceLabel
false, // ownerSide false, // ownerSide
-1, // index -1, // index
false // isBoundaryEdge false // isBoundaryEdge
); );

5
src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -88,6 +88,9 @@ class edgeFaceCirculator
{ {
// Static data members // Static data members
//- End iterator primitiveMesh nullptr
static const primitiveMesh* const endConstIterMeshPtr;
//- End iterator //- End iterator
static const edgeFaceCirculator endConstIter; static const edgeFaceCirculator endConstIter;