From 0cae54b3e1349c48137cb6b4969b173b323b2cfc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 22 Nov 2018 10:52:56 +0100
Subject: [PATCH] COMP: juggle content between stdFoam.H and foamVersion.H
- foamVersion.H now includes stdFoam.H for consistent use
of compatibility compiler defines.
- move forward declaration of Detail, Module namespaces to stdFoam.H
- doxygen documentation of Foam namespace in stdFoam.H
---
src/OpenFOAM/global/foamVersion.H | 13 +------------
src/OpenFOAM/include/stdFoam.H | 15 +++++++++++++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H
index ada9b64dd89..e85cc06bfa7 100644
--- a/src/OpenFOAM/global/foamVersion.H
+++ b/src/OpenFOAM/global/foamVersion.H
@@ -21,12 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Namespace
- Foam
-
-Description
- Namespace for OpenFOAM
-
Global
Foam::FOAMversion
@@ -61,6 +55,7 @@ SourceFiles
#ifndef foamVersion_H
#define foamVersion_H
+#include "stdFoam.H"
#include <string>
// The directory name for user-resources (located in the HOME directory)
@@ -73,12 +68,6 @@ namespace Foam
extern const char* const FOAMversion;
extern const char* const FOAMbuild;
extern const std::string FOAMbuildArch;
-
- //- Implementation details of various OpenFOAM classes
- namespace Detail {}
-
- //- Additional OpenFOAM modules
- namespace Module {}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/include/stdFoam.H b/src/OpenFOAM/include/stdFoam.H
index a06f6dd457b..f46df5febf5 100644
--- a/src/OpenFOAM/include/stdFoam.H
+++ b/src/OpenFOAM/include/stdFoam.H
@@ -25,7 +25,7 @@ Namespace
stdFoam
Description
- Some global templates and macros used by OpenFOAM and some standard
+ Global templates and macros used by OpenFOAM and some standard
C++ headers.
Some of the templates defined here correspond to useful
@@ -61,6 +61,17 @@ SeeAlso
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//- Namespace for OpenFOAM
+namespace Foam
+{
+ //- Implementation details for various OpenFOAM classes
+ namespace Detail {}
+
+ //- Additional OpenFOAM modules
+ namespace Module {}
+}
+
+
namespace stdFoam
{
@@ -224,7 +235,7 @@ constexpr inline const T& max(const T& a, const T& b)
)
-//- Rverse iterate across elements in the \a container object of type
+//- Reverse iterate across elements in the \a container object of type
// \a Container.
// \par Usage
// \code
--
GitLab