Conflicts:
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
applications/utilities/surface/surfaceCheck/surfaceCheck.C
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
NOTE: also needed to strip trailing space/lines in various files
Keeping both functions to ensure that the octant ordering specified in
treeBoundBox is obeyed at the octree level, irrespective of the implementation
of the basic boundBox.
Keeping both functions to ensure that the octant ordering specified in
treeBoundBox is obeyed at the octree level, irrespective of the implementation
of the basic boundBox.
- both versions handle the same input words.
Only need the <Switch> version when the destination variable is
also a Switch and we need to output the word later.
- "cpp -traditional-cpp" doesn't strip C++-style comments
Probably need a workaround with sed -e 's@^ *//@@' if we
wish to support C++-style comments in Make/{files,options}
- lduMatrixTests.C:121:1:
error: ‘Foam::lduMatrix::solverPerformance::solverPerformance’ names
the constructor, not the type
- edgeFaceCirculatorI.H:355:1:
error: ‘Foam::edgeFaceCirculator::edgeFaceCirculator’ names the
constructor, not the type
- patchPointEdgeCirculatorI.H:236:1:
error: ‘Foam::patchPointEdgeCirculator::patchPointEdgeCirculator’
names the constructor, not the type
- objToVTK.C:116:5:
error: ‘Foam::argList::argList’ names the constructor, not the type
same in surfaceClean.C, surfaceRefineRedGreen.C, surfaceSplitByPatch.C
- fireFoam/createFields.H:74:41:
error: type/value mismatch at argument 1 in template parameter list
for ‘template<class T> class Foam::autoPtr’
