From 7797363da01b0c2c6dac32841e1b3cec794ddde7 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 11 Oct 2022 12:37:38 +0100 Subject: [PATCH] Revert "inputSyntaxEntry: Moved inputSyntaxEntry::typeName definition to entryIO.C" This reverts commit 56023e97fb7d2f40b136e0d340c35a9d36e49640. --- src/OpenFOAM/db/dictionary/entry/entryIO.C | 10 +--------- .../inputSyntaxEntry/inputSyntaxEntry.C | 7 ++++++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C index 5d43f003f1..ba6e676f93 100644 --- a/src/OpenFOAM/db/dictionary/entry/entryIO.C +++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,14 +30,6 @@ License #include "inputModeEntry.H" #include "stringOps.H" -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -const Foam::word Foam::functionEntries::inputSyntaxEntry::typeName -( - Foam::functionEntries::inputSyntaxEntry::typeName_() -); - - // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // bool Foam::entry::getKeyword(keyType& keyword, token& keywordToken, Istream& is) diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C index c5edc21571..e7b1ae6f1f 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/inputSyntaxEntry/inputSyntaxEntry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,6 +28,11 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +const Foam::word Foam::functionEntries::inputSyntaxEntry::typeName +( + Foam::functionEntries::inputSyntaxEntry::typeName_() +); + // Don't lookup the debug switch here as the debug switch dictionary // might include inputSyntax entries int Foam::functionEntries::inputSyntaxEntry::debug(0);