From d8cf7788ebc15aeb486a1fa47f5e6e63f71523f5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Fri, 7 Feb 2020 22:09:09 +0000
Subject: [PATCH] CodedBase: Changed construction of static words to avoid
 construction order problems with Clang

---
 src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C          | 4 ++--
 .../utilities/codedFunctionObject/codedFunctionObject.C       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C
index bc56b57452..4fd0147961 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C
@@ -29,11 +29,11 @@ License
 
 template<class CodedType>
 const Foam::word Foam::CodedBase<CodedType>::codeTemplateC =
-    CodedType::typeName + "Template.C";
+    Foam::word(CodedType::typeName_()) + "Template.C";
 
 template<class CodedType>
 const Foam::word Foam::CodedBase<CodedType>::codeTemplateH =
-    CodedType::typeName + "Template.H";
+    Foam::word(CodedType::typeName_()) + "Template.H";
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
index 31f6840406..4ea9eb908b 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
@@ -74,10 +74,10 @@ void Foam::codedFunctionObject::prepare
     dynCode.setFilterVariable("typeName", codeName());
 
     // Compile filtered C template
-    dynCode.addCompileFile("functionObjectTemplate.C");
+    dynCode.addCompileFile(codeTemplateC);
 
     // Copy filtered H template
-    dynCode.addCopyFile("functionObjectTemplate.H");
+    dynCode.addCopyFile(codeTemplateH);
 
     // Debugging: make verbose
     if (debug)