Skip to content
Snippets Groups Projects
Commit 0cae54b3 authored by Mark OLESEN's avatar Mark OLESEN
Browse files

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
parent 28380120
Branches
Tags
No related merge requests found
...@@ -21,12 +21,6 @@ License ...@@ -21,12 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Namespace
Foam
Description
Namespace for OpenFOAM
Global Global
Foam::FOAMversion Foam::FOAMversion
...@@ -61,6 +55,7 @@ SourceFiles ...@@ -61,6 +55,7 @@ SourceFiles
#ifndef foamVersion_H #ifndef foamVersion_H
#define foamVersion_H #define foamVersion_H
#include "stdFoam.H"
#include <string> #include <string>
// The directory name for user-resources (located in the HOME directory) // The directory name for user-resources (located in the HOME directory)
...@@ -73,12 +68,6 @@ namespace Foam ...@@ -73,12 +68,6 @@ namespace Foam
extern const char* const FOAMversion; extern const char* const FOAMversion;
extern const char* const FOAMbuild; extern const char* const FOAMbuild;
extern const std::string FOAMbuildArch; extern const std::string FOAMbuildArch;
//- Implementation details of various OpenFOAM classes
namespace Detail {}
//- Additional OpenFOAM modules
namespace Module {}
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
...@@ -25,7 +25,7 @@ Namespace ...@@ -25,7 +25,7 @@ Namespace
stdFoam stdFoam
Description Description
Some global templates and macros used by OpenFOAM and some standard Global templates and macros used by OpenFOAM and some standard
C++ headers. C++ headers.
Some of the templates defined here correspond to useful Some of the templates defined here correspond to useful
...@@ -61,6 +61,17 @@ SeeAlso ...@@ -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 namespace stdFoam
{ {
...@@ -224,7 +235,7 @@ constexpr inline const T& max(const T& a, const T& b) ...@@ -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. // \a Container.
// \par Usage // \par Usage
// \code // \code
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment