Resolved issues with virtual function inheritance and warning from clang

Also removed __GNUC__ conditional compilation statements which are no
longer needed.
This commit is contained in:
Henry Weller
2015-07-17 12:11:37 +01:00
parent 8ef5d1a0ad
commit 77bf182edc
87 changed files with 428 additions and 325 deletions

View File

@ -186,7 +186,6 @@ mtype {space}"MTYPE:"{space}
label curNumberOfNodes = 0;
label curNumberOfCells = 0;
label curGroupID = 0;
label nFlagsForStream = 0;
label curBoundaryPatch = 0;
label curPatchFace = 0;
%}
@ -478,7 +477,7 @@ mtype {space}"MTYPE:"{space}
IStringStream nFlagsStream(YYText());
nFlagsForStream = readLabel(nFlagsStream);
readLabel(nFlagsStream);
BEGIN(cellStreamTitle);
}
@ -510,7 +509,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags
curGroupID = 0;
nFlagsForStream = 0;
}
@ -522,7 +520,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags
curGroupID = 0;
nFlagsForStream = 0;
BEGIN(INITIAL);
}

View File

@ -426,7 +426,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
for
(
;
iterf != pFaces[WEDGE][0].end(), iterb != pFaces[WEDGE][1].end();
iterf != pFaces[WEDGE][0].end() && iterb != pFaces[WEDGE][1].end();
++iterf, ++iterb
)
{
@ -585,4 +585,3 @@ Info << "Writing cell zoning info to file: " << czPath << endl;
OFstream cz(czPath);
cz << cellZoning << endl;

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,8 +37,6 @@ void Foam::addToFieldList
const typename GeoField::Mesh& mesh
)
{
typedef GeoField fieldType;
if (obj.headerClassName() == GeoField::typeName)
{
fieldList.set