From 0ac85fbdf58132a6fb97c70df88fbdf19eb01f1a Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 9 Jul 2011 22:26:06 +0100 Subject: [PATCH] Clang: Updates to support the changes in the current SVN version of Clang/LLVM --- etc/config/settings.csh | 4 +-- etc/config/settings.sh | 4 +-- src/OpenFOAM/db/typeInfo/className.H | 2 -- .../fanPressureFvPatchScalarField.C | 4 +-- .../surfaceFilmModels/noFilm/noFilm.C | 6 ++-- .../surfaceFilmModel/surfaceFilmModel.C | 32 ++++++++----------- .../surfaceFilmModel/surfaceFilmModel.H | 3 -- .../triSurfaceFields/triSurfaceFields.C | 12 ------- 8 files changed, 22 insertions(+), 45 deletions(-) diff --git a/etc/config/settings.csh b/etc/config/settings.csh index 6b5f43dbc8..2ec4117a2b 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -236,8 +236,8 @@ case ThirdParty: # using clang - not gcc setenv WM_CC 'clang' setenv WM_CXX 'clang++' - set clang_version=llvm-2.9 - #set clang_version=llvm-svn + #set clang_version=llvm-2.9 + set clang_version=llvm-svn breaksw default: echo diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 4e801efd83..057709d316 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -253,8 +253,8 @@ OpenFOAM | ThirdParty) # using clang - not gcc export WM_CC='clang' export WM_CXX='clang++' - clang_version=llvm-2.9 - #clang_version=llvm-svn + #clang_version=llvm-2.9 + clang_version=llvm-svn ;; *) echo diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H index f14cc6100c..d4b87023d2 100644 --- a/src/OpenFOAM/db/typeInfo/className.H +++ b/src/OpenFOAM/db/typeInfo/className.H @@ -119,7 +119,6 @@ public: \ defineTypeNameWithName(Type, Name) //- Define the typeName as \a Name for template sub-classes # define defineTemplate2TypeNameWithName(Type, Name) \ - template<> \ template<> \ defineTypeNameWithName(Type, Name) #endif @@ -161,7 +160,6 @@ public: \ defineDebugSwitchWithName(Type, Name, DebugSwitch) //- Define the debug information for templates sub-classes, lookup as \a Name # define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \ - template<> \ template<> \ defineDebugSwitchWithName(Type, Name, DebugSwitch) #endif diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C index 260fb328dc..19404c4f53 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C @@ -33,9 +33,9 @@ License namespace Foam { template<> - const char* Foam::NamedEnum + const char* NamedEnum < - Foam::fanPressureFvPatchScalarField::fanFlowDirection, + fanPressureFvPatchScalarField::fanFlowDirection, 2 >::names[] = { diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C index 26bad8f390..7fe71e4ead 100644 --- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C +++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C @@ -62,12 +62,12 @@ bool noFilm::read() noFilm::noFilm ( - const word&, + const word& modelType, const fvMesh& mesh, - const dimensionedVector& + const dimensionedVector& g ) : - surfaceFilmModel(mesh) + surfaceFilmModel(modelType, mesh, g) {} diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C index bfded1d8fa..f595568ce5 100644 --- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C +++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C @@ -28,17 +28,19 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -template<> -const char* Foam::NamedEnum -< - Foam::regionModels::surfaceFilmModels::surfaceFilmModel::thermoModelType, - 2 ->::names[] = +namespace Foam { - "constant", - "singleComponent" -}; - + template<> + const char* NamedEnum + < + regionModels::surfaceFilmModels::surfaceFilmModel::thermoModelType, + 2 + >::names[] = + { + "constant", + "singleComponent" + }; +} const Foam::NamedEnum < @@ -48,7 +50,7 @@ const Foam::NamedEnum Foam::regionModels::surfaceFilmModels::surfaceFilmModel::thermoModelTypeNames_; -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { @@ -81,14 +83,6 @@ bool surfaceFilmModel::read() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -surfaceFilmModel::surfaceFilmModel(const fvMesh& mesh) -: - singleLayerRegion(mesh), - g_(vector::zero), - thermoModel_(tmConstant) -{} - - surfaceFilmModel::surfaceFilmModel ( const word& modelType, diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H index 1e26c9db9c..00a4814695 100644 --- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H +++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H @@ -130,9 +130,6 @@ public: // Constructors - //- Construct null - surfaceFilmModel(const fvMesh& mesh); - //- Construct from type name, mesh and gravity vector surfaceFilmModel ( diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.C b/src/triSurface/triSurfaceFields/triSurfaceFields.C index d597f9ecba..6f48d9f2c3 100644 --- a/src/triSurface/triSurfaceFields/triSurfaceFields.C +++ b/src/triSurface/triSurfaceFields/triSurfaceFields.C @@ -32,36 +32,24 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -#ifndef __clang__ template<> -#endif const word triSurfaceLabelField::typeName("triSurfaceLabelField"); -#ifndef __clang__ template<> -#endif const word triSurfaceScalarField::typeName("triSurfaceScalarField"); -#ifndef __clang__ template<> -#endif const word triSurfaceVectorField::typeName("triSurfaceVectorField"); -#ifndef __clang__ template<> -#endif const word triSurfaceSphericalTensorField::typeName ("triSurfaceSphericalTensorField"); -#ifndef __clang__ template<> -#endif const word triSurfaceSymmTensorField::typeName ("triSurfaceSymmTensorField"); -#ifndef __clang__ template<> -#endif const word triSurfaceTensorField::typeName("triSurfaceTensorField"); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //