From 3151dacccc67073d3f4fffb04adb6591c48bcf04 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 1 Dec 2022 15:52:10 +0000 Subject: [PATCH] ENH: include in stdFoam.H - was already included in many places (via UList.C templates), but now formalise by placing in stdFoam.H --- applications/test/HashSet/Test-hashSet.C | 2 -- applications/test/List2/Test-List2.C | 2 -- applications/test/List3/Test-List3.C | 2 -- applications/test/base64/Test-base64Encoding.C | 1 - applications/test/bitops/Test-bitops.C | 1 - applications/test/matrices/EigenMatrix/Test-EigenMatrix.C | 1 - applications/test/matrices/Matrix/Test-Matrix.C | 1 - src/OSspecific/POSIX/regExp/regExpPosixI.H | 2 +- src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C | 1 - src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C | 1 - src/OpenFOAM/containers/Bits/BitOps/BitOps.C | 1 - src/OpenFOAM/containers/Bits/BitOps/BitOps.H | 3 --- src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C | 1 - src/OpenFOAM/containers/HashTables/HashOps/HashOps.C | 2 -- src/OpenFOAM/containers/HashTables/HashOps/HashOps.H | 4 ++-- src/OpenFOAM/containers/HashTables/HashTable/HashTable.H | 3 +-- src/OpenFOAM/containers/Lists/FixedList/FixedList.H | 3 +-- src/OpenFOAM/containers/Lists/FixedList/FixedListI.H | 1 - src/OpenFOAM/containers/Lists/List/List.C | 1 - src/OpenFOAM/containers/Lists/List/UList.C | 1 - src/OpenFOAM/containers/Lists/List/UList.H | 3 +-- src/OpenFOAM/containers/Lists/UniformList/UniformList.H | 2 +- src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H | 2 -- src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C | 1 - src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H | 2 -- .../containers/PtrLists/PtrListDetail/PtrListDetail.C | 1 - src/OpenFOAM/db/IOstreams/token/tokenI.H | 2 +- src/OpenFOAM/fields/Fields/Field/FieldOps.C | 1 - src/OpenFOAM/global/argList/argList.H | 5 ++--- src/OpenFOAM/include/stdFoam.H | 1 + src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H | 5 ++--- src/OpenFOAM/matrices/Matrix/Matrix.C | 1 - src/OpenFOAM/matrices/Matrix/Matrix.H | 4 ++-- src/OpenFOAM/matrices/Matrix/MatrixIO.C | 1 - src/OpenFOAM/meshes/meshShapes/face/face.C | 1 - src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H | 1 - src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C | 1 - src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H | 2 -- src/OpenFOAM/primitives/strings/keyType/keyType.C | 2 +- src/OpenFOAM/primitives/strings/stringOps/stringOps.C | 1 - src/OpenFOAM/primitives/strings/stringOps/stringOps.H | 5 ++--- src/OpenFOAM/primitives/tuples/Pair.H | 2 +- src/conversion/vtk/adaptor/foamVtkTools.H | 2 -- src/fileFormats/abaqus/ABAQUSCore.C | 1 - .../PatchFunction1/MappedFile/MappedFileFilterField.C | 1 - src/meshTools/indexedOctree/treeDataFace.C | 1 - src/meshTools/indexedOctree/treeDataPrimitivePatch.C | 1 - src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C | 1 - .../readers/boundary/boundaryDataSurfaceReaderTemplates.C | 1 - .../lumpedPointMotion/bridge/code/polynomial-motion.C | 1 - 50 files changed, 19 insertions(+), 70 deletions(-) diff --git a/applications/test/HashSet/Test-hashSet.C b/applications/test/HashSet/Test-hashSet.C index c84231f91f..c412b26523 100644 --- a/applications/test/HashSet/Test-hashSet.C +++ b/applications/test/HashSet/Test-hashSet.C @@ -37,8 +37,6 @@ Description #include "labelPairHashes.H" #include "FlatOutput.H" -#include - using namespace Foam; template diff --git a/applications/test/List2/Test-List2.C b/applications/test/List2/Test-List2.C index f080ead62c..b054617844 100644 --- a/applications/test/List2/Test-List2.C +++ b/applications/test/List2/Test-List2.C @@ -40,8 +40,6 @@ Description #include "OFstream.H" #include "cpuTime.H" -#include - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // using namespace Foam; diff --git a/applications/test/List3/Test-List3.C b/applications/test/List3/Test-List3.C index e23b36579b..c3aaaa4d22 100644 --- a/applications/test/List3/Test-List3.C +++ b/applications/test/List3/Test-List3.C @@ -40,8 +40,6 @@ Description #include "OFstream.H" #include "cpuTime.H" -#include - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // using namespace Foam; diff --git a/applications/test/base64/Test-base64Encoding.C b/applications/test/base64/Test-base64Encoding.C index 7da1707cb8..74dc48894a 100644 --- a/applications/test/base64/Test-base64Encoding.C +++ b/applications/test/base64/Test-base64Encoding.C @@ -39,7 +39,6 @@ Description #include "Pair.H" #include -#include using namespace Foam; diff --git a/applications/test/bitops/Test-bitops.C b/applications/test/bitops/Test-bitops.C index 6f77af14b7..a198ac5a51 100644 --- a/applications/test/bitops/Test-bitops.C +++ b/applications/test/bitops/Test-bitops.C @@ -33,7 +33,6 @@ Description #include "IOstreams.H" #include "stdFoam.H" -#include #include #include diff --git a/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C b/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C index c99686591c..0b7ad7d2f6 100644 --- a/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C +++ b/applications/test/matrices/EigenMatrix/Test-EigenMatrix.C @@ -43,7 +43,6 @@ Description #include "IOmanip.H" #include "EigenMatrix.H" #include "TestTools.H" -#include using namespace Foam; diff --git a/applications/test/matrices/Matrix/Test-Matrix.C b/applications/test/matrices/Matrix/Test-Matrix.C index 43115df871..73d23b5fce 100644 --- a/applications/test/matrices/Matrix/Test-Matrix.C +++ b/applications/test/matrices/Matrix/Test-Matrix.C @@ -32,7 +32,6 @@ License #include "Random.H" #include "SortList.H" #include "Switch.H" -#include using namespace Foam; using namespace Foam::MatrixTools; diff --git a/src/OSspecific/POSIX/regExp/regExpPosixI.H b/src/OSspecific/POSIX/regExp/regExpPosixI.H index 4217350c69..a7a97c80d7 100644 --- a/src/OSspecific/POSIX/regExp/regExpPosixI.H +++ b/src/OSspecific/POSIX/regExp/regExpPosixI.H @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ -#include +#include // For std::swap // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C index f405624f6a..2a93ba7194 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C +++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C @@ -29,7 +29,6 @@ License #include "treeDataCell.H" #include "indexedOctree.H" #include "polyMesh.H" -#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C index 64474327b3..e6f9765630 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C +++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C @@ -28,7 +28,6 @@ License #include "treeDataEdge.H" #include "indexedOctree.H" -#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Bits/BitOps/BitOps.C b/src/OpenFOAM/containers/Bits/BitOps/BitOps.C index f313812acd..da0eedc7d6 100644 --- a/src/OpenFOAM/containers/Bits/BitOps/BitOps.C +++ b/src/OpenFOAM/containers/Bits/BitOps/BitOps.C @@ -30,7 +30,6 @@ License #include "HashSet.H" #include "List.H" #include "labelRange.H" -#include // * * * * * * * * * * * * * * * * * BitOps * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Bits/BitOps/BitOps.H b/src/OpenFOAM/containers/Bits/BitOps/BitOps.H index 1f57396c38..79ae909c50 100644 --- a/src/OpenFOAM/containers/Bits/BitOps/BitOps.H +++ b/src/OpenFOAM/containers/Bits/BitOps/BitOps.H @@ -46,13 +46,10 @@ Description #ifndef Foam_BitOps_H #define Foam_BitOps_H -#include "label.H" #include "UList.H" #include "HashSet.H" #include "Ostream.H" -#include #include -#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C b/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C index b8bc37db86..69cc216d51 100644 --- a/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C +++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C @@ -25,7 +25,6 @@ License \*---------------------------------------------------------------------------*/ -#include #include "FixedList.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C index abd8016acb..ad70f1c660 100644 --- a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C +++ b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.C @@ -28,8 +28,6 @@ License #include "HashOps.H" #include "bitSet.H" -#include - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Foam::labelHashSet Foam::HashSetOps::used(const bitSet& select) diff --git a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H index ba54b61440..73a64f7af8 100644 --- a/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H +++ b/src/OpenFOAM/containers/HashTables/HashOps/HashOps.H @@ -40,8 +40,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef HashOps_H -#define HashOps_H +#ifndef Foam_HashOps_H +#define Foam_HashOps_H #include "HashSet.H" #include "List.H" diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H index 4f2f17b49d..2e4549e471 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H @@ -84,15 +84,14 @@ SourceFiles #ifndef Foam_HashTable_H #define Foam_HashTable_H +#include "stdFoam.H" #include "word.H" #include "zero.H" #include "Hash.H" #include "HashTableDetail.H" #include "HashTableCore.H" -#include #include -#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H index 2f2d7b2148..6d172d0df4 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H @@ -51,10 +51,9 @@ SourceFiles #include "SLListFwd.H" #include "ListPolicy.H" -#include #include -#include #include +#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H index f2617b3d4e..c2718e2aba 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H @@ -28,7 +28,6 @@ License #include "UList.H" #include "SLList.H" -#include // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C index 427218b5f0..7286e7054f 100644 --- a/src/OpenFOAM/containers/Lists/List/List.C +++ b/src/OpenFOAM/containers/Lists/List/List.C @@ -32,7 +32,6 @@ License #include "PtrList.H" #include "SLList.H" #include "contiguous.H" -#include // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/List/UList.C b/src/OpenFOAM/containers/Lists/List/UList.C index 6a75e4b6ba..b4b83b902c 100644 --- a/src/OpenFOAM/containers/Lists/List/UList.C +++ b/src/OpenFOAM/containers/Lists/List/UList.C @@ -31,7 +31,6 @@ License #include "contiguous.H" #include "labelRange.H" -#include #include // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H index fa511bc9d9..a2a7ed77c8 100644 --- a/src/OpenFOAM/containers/Lists/List/UList.H +++ b/src/OpenFOAM/containers/Lists/List/UList.H @@ -56,10 +56,9 @@ SourceFiles #include "Hash.H" #include "ListPolicy.H" -#include #include #include -#include +#include // i.e, std::vector // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/UniformList/UniformList.H b/src/OpenFOAM/containers/Lists/UniformList/UniformList.H index b3f6a37038..67f6041417 100644 --- a/src/OpenFOAM/containers/Lists/UniformList/UniformList.H +++ b/src/OpenFOAM/containers/Lists/UniformList/UniformList.H @@ -40,7 +40,7 @@ Note #define Foam_UniformList_H #include "labelFwd.H" -#include +#include // For std::move // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H index e22efa3a46..587bb9163b 100644 --- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H +++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H @@ -43,8 +43,6 @@ SourceFiles #include "PtrList.H" #include -#include -#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C index 7df86c8da3..0fe24b1d49 100644 --- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C +++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C @@ -28,7 +28,6 @@ License #include "PtrList.H" #include "SLPtrList.H" -#include // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H index 1c0963a0b4..a7deaa6423 100644 --- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H +++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H @@ -48,8 +48,6 @@ SourceFiles #include "UPtrList.H" #include "SLPtrListFwd.H" -#include -#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C index 0b23ec6e8c..d236b19b78 100644 --- a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C +++ b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C @@ -26,7 +26,6 @@ License \*---------------------------------------------------------------------------*/ #include "PtrListDetail.H" -#include // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H index e863649b73..fe1a535565 100644 --- a/src/OpenFOAM/db/IOstreams/token/tokenI.H +++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H @@ -26,7 +26,7 @@ License \*---------------------------------------------------------------------------*/ -#include +#include // For std::move, std::swap // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/Field/FieldOps.C b/src/OpenFOAM/fields/Fields/Field/FieldOps.C index 4da68f5028..c50b64023a 100644 --- a/src/OpenFOAM/fields/Fields/Field/FieldOps.C +++ b/src/OpenFOAM/fields/Fields/Field/FieldOps.C @@ -27,7 +27,6 @@ License #include "Pstream.H" #include "ops.H" -#include // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H index bbf4f0f6fb..ebc3bf836a 100644 --- a/src/OpenFOAM/global/argList/argList.H +++ b/src/OpenFOAM/global/argList/argList.H @@ -96,8 +96,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef argList_H -#define argList_H +#ifndef Foam_argList_H +#define Foam_argList_H #include "stringList.H" #include "SLList.H" @@ -107,7 +107,6 @@ SourceFiles #include "ITstream.H" #include "dlLibraryTable.H" #include "OSspecific.H" -#include // Transitional features - older style access (including 1712 release) #define Foam_argList_1712 diff --git a/src/OpenFOAM/include/stdFoam.H b/src/OpenFOAM/include/stdFoam.H index 103de7ce45..877c5ef968 100644 --- a/src/OpenFOAM/include/stdFoam.H +++ b/src/OpenFOAM/include/stdFoam.H @@ -32,6 +32,7 @@ Description #ifndef Foam_stdFoam_H #define Foam_stdFoam_H +#include #include #include #include diff --git a/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H b/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H index 619f88a5fe..aa4a02562f 100644 --- a/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H +++ b/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H @@ -137,14 +137,13 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef EigenMatrix_H -#define EigenMatrix_H +#ifndef Foam_EigenMatrix_H +#define Foam_EigenMatrix_H #include "scalarMatrices.H" #include "DiagonalMatrix.H" #include "SquareMatrix.H" #include "complex.H" -#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C index 0ba6168888..a0234a9d39 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.C +++ b/src/OpenFOAM/matrices/Matrix/Matrix.C @@ -28,7 +28,6 @@ License #include "Matrix.H" #include -#include // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H index eb34e064d3..235625db3d 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.H +++ b/src/OpenFOAM/matrices/Matrix/Matrix.H @@ -47,8 +47,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef Matrix_H -#define Matrix_H +#ifndef Foam_Matrix_H +#define Foam_Matrix_H #include "uLabel.H" #include "Pair.H" diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C index cc3446be1a..b937e5e393 100644 --- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C +++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C @@ -32,7 +32,6 @@ License #include "token.H" #include "contiguous.H" #include "ListPolicy.H" -#include // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C index f1fe690f30..470e4b7b47 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/face.C +++ b/src/OpenFOAM/meshes/meshShapes/face/face.C @@ -31,7 +31,6 @@ License #include "triangle.H" #include "mathematicalConstants.H" #include "Circulator.H" -#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H index fecdf95bee..ea0698f070 100644 --- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H +++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H @@ -28,7 +28,6 @@ License #include "IOstreams.H" #include "face.H" -#include // For std::swap // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C index bf96a5dd48..c9f47203e5 100644 --- a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C +++ b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C @@ -29,7 +29,6 @@ License #include "FixedList.H" #include "List.H" #include "token.H" -#include // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H index d2445381fe..b2ae2c151b 100644 --- a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H +++ b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H @@ -25,8 +25,6 @@ License \*---------------------------------------------------------------------------*/ -#include - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // inline constexpr Foam::sliceRange::sliceRange() noexcept diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.C b/src/OpenFOAM/primitives/strings/keyType/keyType.C index 6749afe42d..15decfb771 100644 --- a/src/OpenFOAM/primitives/strings/keyType/keyType.C +++ b/src/OpenFOAM/primitives/strings/keyType/keyType.C @@ -30,7 +30,7 @@ License #include "regExp.H" #include "token.H" #include "IOstreams.H" -#include // For swap +#include // For std::swap // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C index 0f646b5d7f..7947676d98 100644 --- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C +++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C @@ -33,7 +33,6 @@ License #include "StringStream.H" #include "OSstream.H" #include "OSspecific.H" -#include #include // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H index 29d26b2bee..14f9c743ce 100644 --- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H +++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H @@ -36,8 +36,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef stringOps_H -#define stringOps_H +#ifndef Foam_stringOps_H +#define Foam_stringOps_H #include "scalar.H" #include "string.H" @@ -48,7 +48,6 @@ SourceFiles #include "stringOpsSort.H" #include "stringOpsEvaluate.H" #include "wordRes.H" -#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/tuples/Pair.H b/src/OpenFOAM/primitives/tuples/Pair.H index eaaf3a93ef..9548289ac7 100644 --- a/src/OpenFOAM/primitives/tuples/Pair.H +++ b/src/OpenFOAM/primitives/tuples/Pair.H @@ -44,7 +44,7 @@ See also #include "FixedList.H" #include "Istream.H" -#include +#include // For std::move // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/conversion/vtk/adaptor/foamVtkTools.H b/src/conversion/vtk/adaptor/foamVtkTools.H index 6a20fe1c74..4a1a1b3641 100644 --- a/src/conversion/vtk/adaptor/foamVtkTools.H +++ b/src/conversion/vtk/adaptor/foamVtkTools.H @@ -61,8 +61,6 @@ SourceFiles #include "vtkPoints.h" #include "vtkPolyData.h" -#include - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Forward Declarations diff --git a/src/fileFormats/abaqus/ABAQUSCore.C b/src/fileFormats/abaqus/ABAQUSCore.C index 056a1891c6..bc478cfa06 100644 --- a/src/fileFormats/abaqus/ABAQUSCore.C +++ b/src/fileFormats/abaqus/ABAQUSCore.C @@ -31,7 +31,6 @@ License #include "stringOps.H" #include "UIListStream.H" #include "cellModel.H" -#include #include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C b/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C index 59cde08c01..fd738efbcb 100644 --- a/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C +++ b/src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C @@ -31,7 +31,6 @@ License #include "MinMax.H" #include "indexedOctree.H" #include "treeDataPoint.H" -#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C index d410b52094..7be1099a86 100644 --- a/src/meshTools/indexedOctree/treeDataFace.C +++ b/src/meshTools/indexedOctree/treeDataFace.C @@ -29,7 +29,6 @@ License #include "treeDataFace.H" #include "polyMesh.H" #include "triangle.H" -#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C index 62fac283e6..74d7a76448 100644 --- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C +++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C @@ -31,7 +31,6 @@ License #include "triangle.H" #include "triSurfaceTools.H" #include "triFace.H" -#include // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // diff --git a/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C b/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C index 2f51ee0383..14030e1205 100644 --- a/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C +++ b/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C @@ -30,7 +30,6 @@ License #include "argList.H" #include "Time.H" #include "addToRunTimeSelectionTable.H" -#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C b/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C index 8494099738..66b7bb226b 100644 --- a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C +++ b/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C @@ -29,7 +29,6 @@ License #include "rawIOField.H" #include "argList.H" #include "Time.H" -#include // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C b/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C index 5c78be00cc..0a5ba420df 100644 --- a/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C +++ b/tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C @@ -45,7 +45,6 @@ Note #include "lumpedPointTools.H" #include "lumpedPointState.H" #include "lumpedPointIOMovement.H" -#include using namespace Foam;