From 038bb40a79d0edcd2d9b064ece6fe79473e31cf8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 22 Jan 2018 15:13:39 +0100
Subject: [PATCH] COMP: resolve template qualification and other issues for
 clang-5.0.1

---
 .../CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C           | 3 ++-
 .../CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H           | 4 ++--
 src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C    | 3 +--
 src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 71be26d88d..a8632062e4 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -102,7 +102,7 @@ void CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::operator=
 
 template<class Type>
 template<class GeoField>
-CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>&
+typename CrankNicolsonDdtScheme<Type>::template DDt0Field<GeoField>&
 CrankNicolsonDdtScheme<Type>::ddt0_
 (
     const word& name,
@@ -192,6 +192,7 @@ bool CrankNicolsonDdtScheme<Type>::evaluate
     return ddt0.timeIndex() != mesh().time().timeIndex();
 }
 
+
 template<class Type>
 template<class GeoField>
 scalar CrankNicolsonDdtScheme<Type>::coef_
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index 331d2c5bbc..e7538c451d 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -164,10 +164,10 @@ class CrankNicolsonDdtScheme
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        CrankNicolsonDdtScheme(const CrankNicolsonDdtScheme&);
+        CrankNicolsonDdtScheme(const CrankNicolsonDdtScheme&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const CrankNicolsonDdtScheme&);
+        void operator=(const CrankNicolsonDdtScheme&) = delete;
 
         template<class GeoField>
         DDt0Field<GeoField>& ddt0_
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 5bdcc7fb1a..23394240f4 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -54,8 +54,7 @@ void Foam::DSMCCloud<ParcelType>::buildConstProps()
 
         const dictionary& molDict(moleculeProperties.subDict(id));
 
-        constProps_[i] =
-        typename ParcelType::constantProperties::constantProperties(molDict);
+        constProps_[i] = typename ParcelType::constantProperties(molDict);
     }
 }
 
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index 823cb35470..b657ea270c 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -429,7 +429,7 @@ void Foam::RBD::rigidBodyModel::write(Ostream& os) const
 
         forAll(restraints_, ri)
         {
-            const word& restraintType(restraints_[ri].type());
+            // const word& restraintType(restraints_[ri].type());
 
             os.beginBlock(restraints_[ri].name());