zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CodedBase: Changed construction of static words to avoid construction order problems with Clang

Browse Source
This commit is contained in:
Henry Weller
2020-02-07 22:09:09 +00:00
parent 04a3f9f237
commit d8cf7788eb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C
View File

@ -29,11 +29,11 @@ License
template<class CodedType> template<class CodedType>
const Foam::word Foam::CodedBase<CodedType>::codeTemplateC = const Foam::word Foam::CodedBase<CodedType>::codeTemplateC =
CodedType::typeName + "Template.C"; Foam::word(CodedType::typeName_()) + "Template.C";
template<class CodedType> template<class CodedType>
const Foam::word Foam::CodedBase<CodedType>::codeTemplateH = const Foam::word Foam::CodedBase<CodedType>::codeTemplateH =
CodedType::typeName + "Template.H"; Foam::word(CodedType::typeName_()) + "Template.H";
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

4
src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
View File

@ -74,10 +74,10 @@ void Foam::codedFunctionObject::prepare
dynCode.setFilterVariable("typeName", codeName()); dynCode.setFilterVariable("typeName", codeName());
// Compile filtered C template // Compile filtered C template
dynCode.addCompileFile("functionObjectTemplate.C"); dynCode.addCompileFile(codeTemplateC);
// Copy filtered H template // Copy filtered H template
dynCode.addCopyFile("functionObjectTemplate.H"); dynCode.addCopyFile(codeTemplateH);
// Debugging: make verbose // Debugging: make verbose
if (debug) if (debug)