ENH: include <algorithm> 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

@@ -37,8 +37,6 @@ Description
 #include "labelPairHashes.H"
 #include "FlatOutput.H"
 
-#include <algorithm>
-
 using namespace Foam;
 
 template<class Iter>

applications/test/List2/Test-List2.C

@@ -40,8 +40,6 @@ Description
 #include "OFstream.H"
 #include "cpuTime.H"
 
-#include <initializer_list>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 using namespace Foam;

applications/test/List3/Test-List3.C

@@ -40,8 +40,6 @@ Description
 #include "OFstream.H"
 #include "cpuTime.H"
 
-#include <initializer_list>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 using namespace Foam;

applications/test/base64/Test-base64Encoding.C

@@ -39,7 +39,6 @@ Description
 #include "Pair.H"
 
 #include <sstream>
-#include <initializer_list>
 
 using namespace Foam;
 

applications/test/bitops/Test-bitops.C

@@ -33,7 +33,6 @@ Description
 #include "IOstreams.H"
 #include "stdFoam.H"
 
-#include <algorithm>
 #include <type_traits>
 #include <limits>
 

applications/test/matrices/EigenMatrix/Test-EigenMatrix.C

@@ -43,7 +43,6 @@ Description
 #include "IOmanip.H"
 #include "EigenMatrix.H"
 #include "TestTools.H"
-#include <algorithm>
 
 using namespace Foam;
 

applications/test/matrices/Matrix/Test-Matrix.C

@@ -32,7 +32,6 @@ License
 #include "Random.H"
 #include "SortList.H"
 #include "Switch.H"
-#include <algorithm>
 
 using namespace Foam;
 using namespace Foam::MatrixTools;

src/OSspecific/POSIX/regExp/regExpPosixI.H

@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
+#include <utility>  // For std::swap
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 

src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C

@@ -29,7 +29,6 @@ License
 #include "treeDataCell.H"
 #include "indexedOctree.H"
 #include "polyMesh.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C

@@ -28,7 +28,6 @@ License
 
 #include "treeDataEdge.H"
 #include "indexedOctree.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/Bits/BitOps/BitOps.C

@@ -30,7 +30,6 @@ License
 #include "HashSet.H"
 #include "List.H"
 #include "labelRange.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * * BitOps  * * * * * * * * * * * * * * * * //
 

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 <algorithm>
 #include <limits>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/Bits/bitSet/bitSetTemplates.C

@@ -25,7 +25,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
 #include "FixedList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/OpenFOAM/containers/HashTables/HashOps/HashOps.C

@@ -28,8 +28,6 @@ License
 #include "HashOps.H"
 #include "bitSet.H"
 
-#include <algorithm>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::labelHashSet Foam::HashSetOps::used(const bitSet& select)

src/OpenFOAM/containers/HashTables/HashOps/HashOps.H

@@ -40,8 +40,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef HashOps_H
+#ifndef Foam_HashOps_H
-#define HashOps_H
+#define Foam_HashOps_H
 
 #include "HashSet.H"
 #include "List.H"

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 <initializer_list>
 #include <iterator>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/Lists/FixedList/FixedList.H

@@ -51,10 +51,9 @@ SourceFiles
 #include "SLListFwd.H"
 #include "ListPolicy.H"
 
-#include <initializer_list>
 #include <iterator>
-#include <type_traits>
 #include <limits>
+#include <type_traits>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/Lists/FixedList/FixedListI.H

@@ -28,7 +28,6 @@ License
 
 #include "UList.H"
 #include "SLList.H"
-#include <utility>
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 

src/OpenFOAM/containers/Lists/List/List.C

@@ -32,7 +32,6 @@ License
 #include "PtrList.H"
 #include "SLList.H"
 #include "contiguous.H"
-#include <utility>
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/OpenFOAM/containers/Lists/List/UList.C

@@ -31,7 +31,6 @@ License
 #include "contiguous.H"
 #include "labelRange.H"
 
-#include <algorithm>
 #include <random>
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //

src/OpenFOAM/containers/Lists/List/UList.H

@@ -56,10 +56,9 @@ SourceFiles
 #include "Hash.H"
 #include "ListPolicy.H"
 
-#include <initializer_list>
 #include <iterator>
 #include <type_traits>
-#include <vector>
+#include <vector>  // i.e, std::vector
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/Lists/UniformList/UniformList.H

@@ -40,7 +40,7 @@ Note
 #define Foam_UniformList_H
 
 #include "labelFwd.H"
-#include <utility>
+#include <utility>  // For std::move
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H

@@ -43,8 +43,6 @@ SourceFiles
 
 #include "PtrList.H"
 #include <type_traits>
-#include <memory>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/PtrLists/PtrList/PtrList.C

@@ -28,7 +28,6 @@ License
 
 #include "PtrList.H"
 #include "SLPtrList.H"
-#include <utility>
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H

@@ -48,8 +48,6 @@ SourceFiles
 
 #include "UPtrList.H"
 #include "SLPtrListFwd.H"
-#include <memory>
-#include <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C

@@ -26,7 +26,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PtrListDetail.H"
-#include <utility>
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 

src/OpenFOAM/db/IOstreams/token/tokenI.H

@@ -26,7 +26,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
+#include <utility>  // For std::move, std::swap
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 

src/OpenFOAM/fields/Fields/Field/FieldOps.C

@@ -27,7 +27,6 @@ License
 
 #include "Pstream.H"
 #include "ops.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 

src/OpenFOAM/global/argList/argList.H

@@ -96,8 +96,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef argList_H
+#ifndef Foam_argList_H
-#define 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 <utility>
 
 // Transitional features - older style access (including 1712 release)
 #define Foam_argList_1712

src/OpenFOAM/include/stdFoam.H

@@ -32,6 +32,7 @@ Description
 #ifndef Foam_stdFoam_H
 #define Foam_stdFoam_H
 
+#include <algorithm>
 #include <initializer_list>
 #include <memory>
 #include <utility>

src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.H

@@ -137,14 +137,13 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef EigenMatrix_H
+#ifndef Foam_EigenMatrix_H
-#define EigenMatrix_H
+#define Foam_EigenMatrix_H
 
 #include "scalarMatrices.H"
 #include "DiagonalMatrix.H"
 #include "SquareMatrix.H"
 #include "complex.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/matrices/Matrix/Matrix.C

@@ -28,7 +28,6 @@ License
 
 #include "Matrix.H"
 #include <functional>
-#include <algorithm>
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/OpenFOAM/matrices/Matrix/Matrix.H

@@ -47,8 +47,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Matrix_H
+#ifndef Foam_Matrix_H
-#define Matrix_H
+#define Foam_Matrix_H
 
 #include "uLabel.H"
 #include "Pair.H"

src/OpenFOAM/matrices/Matrix/MatrixIO.C

@@ -32,7 +32,6 @@ License
 #include "token.H"
 #include "contiguous.H"
 #include "ListPolicy.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 

src/OpenFOAM/meshes/meshShapes/face/face.C

@@ -31,7 +31,6 @@ License
 #include "triangle.H"
 #include "mathematicalConstants.H"
 #include "Circulator.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H

@@ -28,7 +28,6 @@ License
 
 #include "IOstreams.H"
 #include "face.H"
-#include <algorithm>  // For std::swap
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.C

@@ -29,7 +29,6 @@ License
 #include "FixedList.H"
 #include "List.H"
 #include "token.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/ranges/sliceRange/sliceRangeI.H

@@ -25,8 +25,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include <algorithm>
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline constexpr Foam::sliceRange::sliceRange() noexcept

src/OpenFOAM/primitives/strings/keyType/keyType.C

@@ -30,7 +30,7 @@ License
 #include "regExp.H"
 #include "token.H"
 #include "IOstreams.H"
-#include <algorithm>  // For swap
+#include <utility>  // For std::swap
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/strings/stringOps/stringOps.C

@@ -33,7 +33,6 @@ License
 #include "StringStream.H"
 #include "OSstream.H"
 #include "OSspecific.H"
-#include <algorithm>
 #include <cctype>
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //

src/OpenFOAM/primitives/strings/stringOps/stringOps.H

@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef stringOps_H
+#ifndef Foam_stringOps_H
-#define 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 <utility>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/tuples/Pair.H

@@ -44,7 +44,7 @@ See also
 
 #include "FixedList.H"
 #include "Istream.H"
-#include <utility>
+#include <utility>  // For std::move
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/conversion/vtk/adaptor/foamVtkTools.H

@@ -61,8 +61,6 @@ SourceFiles
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-#include <utility>
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Forward Declarations

src/fileFormats/abaqus/ABAQUSCore.C

@@ -31,7 +31,6 @@ License
 #include "stringOps.H"
 #include "UIListStream.H"
 #include "cellModel.H"
-#include <algorithm>
 #include <cctype>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

src/meshTools/PatchFunction1/MappedFile/MappedFileFilterField.C

@@ -31,7 +31,6 @@ License
 #include "MinMax.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/meshTools/indexedOctree/treeDataFace.C

@@ -29,7 +29,6 @@ License
 #include "treeDataFace.H"
 #include "polyMesh.H"
 #include "triangle.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/meshTools/indexedOctree/treeDataPrimitivePatch.C

@@ -31,7 +31,6 @@ License
 #include "triangle.H"
 #include "triSurfaceTools.H"
 #include "triFace.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 

src/surfMesh/readers/boundary/boundaryDataSurfaceReader.C

@@ -30,7 +30,6 @@ License
 #include "argList.H"
 #include "Time.H"
 #include "addToRunTimeSelectionTable.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C

@@ -29,7 +29,6 @@ License
 #include "rawIOField.H"
 #include "argList.H"
 #include "Time.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 

tutorials/incompressible/lumpedPointMotion/bridge/code/polynomial-motion.C

@@ -45,7 +45,6 @@ Note
 #include "lumpedPointTools.H"
 #include "lumpedPointState.H"
 #include "lumpedPointIOMovement.H"
-#include <algorithm>
 
 using namespace Foam;