Clang: Updates to support the changes in the current SVN version of Clang/LLVM

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

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

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

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[] =
     {

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)
 {}
 
 

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,

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
         (

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");
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //