From c0766ce8ea943088a1e22d49441ab8c0a32cfd3c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 27 Apr 2018 09:51:35 +0200 Subject: [PATCH] STYLE: consistent '// End namespace' markers --- applications/test/List/Test-List.C | 2 +- .../test/contiguous/Test-contiguous.C | 2 +- .../foamToEnsight/ensightOutputCloud.H | 4 +- .../ensightOutputSerialCloud.H | 4 +- src/OSspecific/POSIX/clockValue/clockValue.C | 2 +- .../POSIX/signals/sigStopAtWriteNow.C | 2 +- src/OSspecific/POSIX/signals/sigWriteNow.C | 2 +- src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H | 2 +- src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H | 2 +- .../db/IOstreams/StringStreams/StringStream.H | 2 +- .../db/IOstreams/hashes/OSHA1stream.H | 2 +- .../db/IOstreams/memory/IListStream.H | 2 +- .../db/IOstreams/memory/OCountStream.H | 2 +- .../db/IOstreams/memory/OListStream.H | 2 +- .../db/IOstreams/memory/UIListStream.H | 2 +- .../db/IOstreams/memory/UOListStream.H | 2 +- .../primitiveEntry/primitiveEntryIO.C | 2 +- .../mapPolyMesh/objectMap/objectMap.H | 11 +++-- .../mapPolyMesh/objectMap/objectMapI.H | 42 +++++++------------ .../primitives/strings/stringOps/stringOps.C | 2 +- src/conversion/ccm/reader/ccmReader.H | 3 +- src/fileFormats/stl/STLAsciiParseManual.C | 4 +- src/fileFormats/stl/STLAsciiParseRagel.C | 4 +- src/fileFormats/stl/STLAsciiParseRagel.rl | 4 +- src/fileFormats/stl/STLReader.H | 5 ++- .../field/externalCoupled/externalCoupled.C | 7 ++-- .../PatchInjection/patchInjectionBase.H | 2 +- src/lumpedPointMotion/lumpedPointMovement.C | 3 +- .../blockEdges/BSplineEdge/BSplineEdge.H | 2 +- .../blockMesh/blockEdges/arcEdge/arcEdge.H | 2 +- src/mesh/blockMesh/blockEdges/bezier/bezier.H | 2 +- .../blockMesh/blockEdges/lineEdge/lineEdge.H | 2 +- .../blockEdges/polyLineEdge/polyLineEdge.H | 2 +- .../blockEdges/splineEdge/splineEdge.H | 2 +- .../kinematicSingleLayerTemplates.C | 6 +-- .../filmViscosityModel/filmViscosityModel.C | 6 +-- .../filmViscosityModelNew.C | 6 +-- .../phaseChangeModel/phaseChangeModel.C | 6 +-- .../phaseChangeModel/phaseChangeModelNew.C | 6 +-- .../thermoSingleLayer/thermoSingleLayer.C | 6 +-- .../thermalBaffle/thermalBaffle.C | 6 +-- .../MeshedSurface/MeshedSurfaceCore.C | 3 +- wmake/src/wmkdepend.cpp | 2 +- wmake/src/wmkdepend.rl | 2 +- 44 files changed, 85 insertions(+), 101 deletions(-) diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C index 979ce9ac5d..95b800de93 100644 --- a/applications/test/List/Test-List.C +++ b/applications/test/List/Test-List.C @@ -64,7 +64,7 @@ public: using List::List; }; -} // end namespace Foam +} // End namespace Foam using namespace Foam; diff --git a/applications/test/contiguous/Test-contiguous.C b/applications/test/contiguous/Test-contiguous.C index cfd324a22f..2de7836bd3 100644 --- a/applications/test/contiguous/Test-contiguous.C +++ b/applications/test/contiguous/Test-contiguous.C @@ -50,7 +50,7 @@ namespace Foam // Wrong, but interesting to test // template<> struct contiguous> : std::true_type {}; -} // end namespace Foam +} // End namespace Foam using namespace Foam; diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H index b768f5180a..c943cdb1fd 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightOutputCloud.H @@ -80,8 +80,8 @@ bool writeCloudField ); -} // namespace ensightCloud -} // namespace Foam +} // End namespace ensightCloud +} // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H index ff7608be5c..16efb842c1 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputSerialCloud.H @@ -72,8 +72,8 @@ bool writeCloudField ); -} // namespace ensightSerialCloud -} // namespace Foam +} // End namespace ensightSerialCloud +} // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OSspecific/POSIX/clockValue/clockValue.C b/src/OSspecific/POSIX/clockValue/clockValue.C index 21dc73e2fd..7394feaf55 100644 --- a/src/OSspecific/POSIX/clockValue/clockValue.C +++ b/src/OSspecific/POSIX/clockValue/clockValue.C @@ -35,7 +35,7 @@ namespace constexpr int factorMicro = (1000000); constexpr int factorMicro2 = (500000); -} // end of anonymous +} // End anonymous namespace // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C index fba8ed0071..fe40c6dbea 100644 --- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C +++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C @@ -76,7 +76,7 @@ addstopAtWriteNowSignalToOpt addstopAtWriteNowSignalToOpt_ "stopAtWriteNowSignal" ); -} // end of namespace Foam +} // End namespace Foam // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.C b/src/OSspecific/POSIX/signals/sigWriteNow.C index 812d89f863..fcc1c15f1b 100644 --- a/src/OSspecific/POSIX/signals/sigWriteNow.C +++ b/src/OSspecific/POSIX/signals/sigWriteNow.C @@ -74,7 +74,7 @@ public: addwriteNowSignalToOpt addwriteNowSignalToOpt_("writeNowSignal"); -} // end of namespace Foam +} // End namespace Foam // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H index d3a60388e2..c6faae7f2c 100644 --- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H +++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H @@ -85,7 +85,7 @@ protected: }; -} // end namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H index adb4bf77e2..dccea8ccd5 100644 --- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H +++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H @@ -87,7 +87,7 @@ protected: }; -} // end namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H index 08ae90e8e7..5e091bb5b9 100644 --- a/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H +++ b/src/OpenFOAM/db/IOstreams/StringStreams/StringStream.H @@ -99,7 +99,7 @@ public: } }; -} // end of namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H index 50899066b3..96044458e1 100644 --- a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H +++ b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H @@ -170,7 +170,7 @@ public: }; -} // end of namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/memory/IListStream.H b/src/OpenFOAM/db/IOstreams/memory/IListStream.H index c6c5300cc4..7170dc4300 100644 --- a/src/OpenFOAM/db/IOstreams/memory/IListStream.H +++ b/src/OpenFOAM/db/IOstreams/memory/IListStream.H @@ -121,7 +121,7 @@ public: } }; -} // end namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/memory/OCountStream.H b/src/OpenFOAM/db/IOstreams/memory/OCountStream.H index a7f0aae83f..3d4f4367dd 100644 --- a/src/OpenFOAM/db/IOstreams/memory/OCountStream.H +++ b/src/OpenFOAM/db/IOstreams/memory/OCountStream.H @@ -192,7 +192,7 @@ public: } }; -} // end of namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/memory/OListStream.H b/src/OpenFOAM/db/IOstreams/memory/OListStream.H index 249413ff5c..e95b0a91f0 100644 --- a/src/OpenFOAM/db/IOstreams/memory/OListStream.H +++ b/src/OpenFOAM/db/IOstreams/memory/OListStream.H @@ -361,7 +361,7 @@ public: } }; -} // end of namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/memory/UIListStream.H b/src/OpenFOAM/db/IOstreams/memory/UIListStream.H index 4e6df766b7..b397c47333 100644 --- a/src/OpenFOAM/db/IOstreams/memory/UIListStream.H +++ b/src/OpenFOAM/db/IOstreams/memory/UIListStream.H @@ -191,7 +191,7 @@ public: } }; -} // end of namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/IOstreams/memory/UOListStream.H b/src/OpenFOAM/db/IOstreams/memory/UOListStream.H index 3e58c94fd3..461549891e 100644 --- a/src/OpenFOAM/db/IOstreams/memory/UOListStream.H +++ b/src/OpenFOAM/db/IOstreams/memory/UOListStream.H @@ -164,7 +164,7 @@ public: } }; -} // end of namespace Detail +} // End namespace Detail /*---------------------------------------------------------------------------*\ diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C index eb0342e1ce..efebf3170c 100644 --- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C +++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C @@ -44,7 +44,7 @@ namespace << " " << msg << std::endl; } -} // end of anonymous namespace +} // End anonymous namespace // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H index fcc57c98fc..4c33c67b05 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/objectMap/objectMap.H @@ -43,7 +43,7 @@ SourceFiles namespace Foam { -// Forward declaration of friend functions and operators +// Forward declarations class objectMap; inline bool operator==(const objectMap& a, const objectMap& b); @@ -53,7 +53,7 @@ inline Istream& operator>>(Istream&, objectMap&); /*---------------------------------------------------------------------------*\ - Class objectMap Declaration + Class objectMap Declaration \*---------------------------------------------------------------------------*/ class objectMap @@ -71,14 +71,14 @@ public: // Constructors - //- Null constructor for lists + //- Null constructor, with index=-1 and no objects inline objectMap(); //- Construct from components - inline objectMap(const label index, const labelList& master); + inline objectMap(const label index, const UList