From 8a915d0617c91eef4d05791edf6e3adc084ef481 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 31 May 2016 17:17:24 +0100 Subject: [PATCH] includeEntry, includeEtcEntry, includeIfPresentEntry: report -> log for consistency with the 'Log' macro. --- .../miscellaneous/expandDictionary/expandDictionary.C | 4 ++-- .../dictionary/functionEntries/includeEntry/includeEntry.C | 6 +++--- .../dictionary/functionEntries/includeEntry/includeEntry.H | 2 +- .../functionEntries/includeEtcEntry/includeEtcEntry.C | 6 +++--- .../functionEntries/includeEtcEntry/includeEtcEntry.H | 2 +- .../includeIfPresentEntry/includeIfPresentEntry.C | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C index 1b8ecac86..bdcea1fd9 100644 --- a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C +++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) if (listOpt) { - Foam::functionEntries::includeEntry::report = true; + Foam::functionEntries::includeEntry::log = true; } dictionary dict(IFstream(dictName)(), true); diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C index 8e836e50f..f721b68fe 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C @@ -40,7 +40,7 @@ const Foam::word Foam::functionEntries::includeEntry::typeName // might include includeEntry int Foam::functionEntries::includeEntry::debug(0); -bool Foam::functionEntries::includeEntry::report(false); +bool Foam::functionEntries::includeEntry::log(false); namespace Foam @@ -131,7 +131,7 @@ bool Foam::functionEntries::includeEntry::execute if (ifs) { - if (Foam::functionEntries::includeEntry::report) + if (Foam::functionEntries::includeEntry::log) { Info<< fName << endl; } @@ -169,7 +169,7 @@ bool Foam::functionEntries::includeEntry::execute if (ifs) { - if (Foam::functionEntries::includeEntry::report) + if (Foam::functionEntries::includeEntry::log) { Info<< fName << endl; } diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H index a2fae0e67..da20a6b7b 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H @@ -92,7 +92,7 @@ public: // Static data members //- Report which file is included to stdout - static bool report; + static bool log; //- Runtime type information diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C index ee591a1b8..3598ab544 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C @@ -40,7 +40,7 @@ const Foam::word Foam::functionEntries::includeEtcEntry::typeName // might include includeEtcEntry int Foam::functionEntries::includeEtcEntry::debug(0); -bool Foam::functionEntries::includeEtcEntry::report(false); +bool Foam::functionEntries::includeEtcEntry::log(false); namespace Foam @@ -108,7 +108,7 @@ bool Foam::functionEntries::includeEtcEntry::execute if (ifs) { - if (Foam::functionEntries::includeEtcEntry::report) + if (Foam::functionEntries::includeEtcEntry::log) { Info<< fName << endl; } @@ -146,7 +146,7 @@ bool Foam::functionEntries::includeEtcEntry::execute if (ifs) { - if (Foam::functionEntries::includeEtcEntry::report) + if (Foam::functionEntries::includeEtcEntry::log) { Info<< fName << endl; } diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H index cf0f7f358..605cd384e 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H @@ -100,7 +100,7 @@ public: // Static data members //- Report which file is included to stdout - static bool report; + static bool log; //- Runtime type information diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C index 2c0ccc989..966388ea3 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C @@ -74,7 +74,7 @@ bool Foam::functionEntries::includeIfPresentEntry::execute if (ifs) { - if (Foam::functionEntries::includeEntry::report) + if (Foam::functionEntries::includeEntry::log) { Info<< fName << endl; } @@ -97,7 +97,7 @@ bool Foam::functionEntries::includeIfPresentEntry::execute if (ifs) { - if (Foam::functionEntries::includeEntry::report) + if (Foam::functionEntries::includeEntry::log) { Info<< fName << endl; }