diff --git a/applications/test/Hashing/Test-Hashing.C b/applications/test/Hashing/Test-Hashing.C index 6485ef8c15c506333b7a484f3aece36389b712d9..0028ef638b833466fdb2bd9be5cca9b8a6e8890b 100644 --- a/applications/test/Hashing/Test-Hashing.C +++ b/applications/test/Hashing/Test-Hashing.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2018-2019 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -38,6 +38,7 @@ Description #include "stringList.H" #include "labelList.H" #include "labelPair.H" +#include "wordPair.H" #include "edgeList.H" #include "faceList.H" #include "triFaceList.H" @@ -154,8 +155,6 @@ void reportHashList(const UList& list) } -typedef Pair wordPair; - void reportHashList(const UList& list) { Info<<"contiguous = " << is_contiguous::value << nl << nl; @@ -269,16 +268,20 @@ int main(int argc, char *argv[]) IFstream is("hashingTests"); - if (!is.good()) + if (is.good()) { - Info<< "No \"hashingTests\" file found ...\n"; + Info<< nl << "Process " << is.name() << " file ..." << nl; } - - while (is.good()) + else { - const word listType(is); + Info<< nl << "No " << is.name() << " file found ..." << nl; + } - if (listType.empty()) continue; + token tok; + + while (is.good() && is.read(tok) && tok.good()) + { + const word listType(tok.wordToken()); Info<< nl; IOobject::writeDivider(Info) << listType << nl; @@ -286,7 +289,6 @@ int main(int argc, char *argv[]) if (listType == "stringList") { stringList list(is); - reportHashList(list); } else if (listType == "labelList") diff --git a/src/OpenFOAM/primitives/Pair/Pair.H b/src/OpenFOAM/primitives/Pair/Pair.H index 55455407202b1e7cf83710d046b99549df1a7eea..5b9dd491fc3d60fee45844a661673119a12a598d 100644 --- a/src/OpenFOAM/primitives/Pair/Pair.H +++ b/src/OpenFOAM/primitives/Pair/Pair.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -51,11 +51,12 @@ See also namespace Foam { -// Forward declarations +// Forward Declarations template class Pair; // Common pair types typedef Pair