From f182b725da1be23f60cc3d3e80926d541f3d486a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 1 Mar 2011 15:21:30 +0100 Subject: [PATCH] STYLE: use 'static const' instead of 'const static' for consistency --- .../fluentMeshToFoam/extrudedQuadCellShape.C | 4 ++-- .../fluentMeshToFoam/extrudedTriangleCellShape.C | 4 ++-- .../mesh/conversion/sammToFoam/calcPointCells.C | 4 ++-- .../mesh/conversion/star3ToFoam/calcPointCells.C | 4 ++-- .../graphics/fieldview9Reader/readerDatabase.H | 10 +++++----- src/conversion/meshReader/calcPointCells.C | 4 ++-- src/sampling/sampledSet/sampledSet/sampledSet.H | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C index 52725b34fa..901243eaad 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ cellShape extrudedQuadCellShape faceList& frontAndBackFaces ) { - const static cellModel* hexModelPtr_ = NULL; + static const cellModel* hexModelPtr_ = NULL; if (!hexModelPtr_) { diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C index 954906998c..5d21940f31 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ cellShape extrudedTriangleCellShape faceList& frontAndBackFaces ) { - const static cellModel* prismModelPtr_ = NULL; + static const cellModel* prismModelPtr_ = NULL; if (!prismModelPtr_) { diff --git a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C index 70466aad5e..b38fd92071 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C +++ b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description void sammMesh::calcPointCells() const { - const static label UNIT_POINT_CELLS = 12; + static const label UNIT_POINT_CELLS = 12; if (pointCellsPtr_) { diff --git a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C index f3f4c36ef6..a76c8db4e4 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description void starMesh::calcPointCells() const { - const static label UNIT_POINT_CELLS = 12; + static const label UNIT_POINT_CELLS = 12; if (pointCellsPtr_) { diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H index 771e6cd6bd..607b891be9 100644 --- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H +++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,8 +25,8 @@ Class Foam::readerDatabase Description - Singleton caching OpenFOAM database and mesh and various. Used in Fv reader - to keep track of data inbetween callbacks. + Singleton caching OpenFOAM database and mesh and various. + Used in Fv reader to keep track of data in between callbacks. SourceFiles readerDatabase.C @@ -54,7 +54,7 @@ class fileName; class instant; /*---------------------------------------------------------------------------*\ - Class readerDatabase Declaration + Class readerDatabase Declaration \*---------------------------------------------------------------------------*/ class readerDatabase @@ -107,7 +107,7 @@ public: //- Debug flag. Note: uses envvar instead of controlDict since // *this is static as well. Might be initialized before controlDict // read. - const static bool debug_; + static const bool debug_; // Constructors diff --git a/src/conversion/meshReader/calcPointCells.C b/src/conversion/meshReader/calcPointCells.C index 948d15ce81..a1e0f92285 100644 --- a/src/conversion/meshReader/calcPointCells.C +++ b/src/conversion/meshReader/calcPointCells.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description void Foam::meshReader::calcPointCells() const { - const static label UNIT_POINT_CELLS = 12; + static const label UNIT_POINT_CELLS = 12; if (pointCellsPtr_) { diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H index dbaf107070..7b2cd177b1 100644 --- a/src/sampling/sampledSet/sampledSet/sampledSet.H +++ b/src/sampling/sampledSet/sampledSet/sampledSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ class polyMesh; class meshSearch; /*---------------------------------------------------------------------------*\ - Class sampledSet Declaration + Class sampledSet Declaration \*---------------------------------------------------------------------------*/ class sampledSet @@ -194,7 +194,7 @@ public: //- Tolerance when comparing points. Usually relative to difference // between start_ and end_ - const static scalar tol; + static const scalar tol; // Constructors