Skip to content
Snippets Groups Projects
Commit 599dba9c authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

Merge branch 'cherry-pick-3827c744' into 'patch_4_8_1'

missing #include in gmsh.h_cwrap (cf. #1285)

See merge request gmsh/gmsh!412
parents 2d1abfb8 3d59a099
Branches
Tags
No related merge requests found
...@@ -954,6 +954,7 @@ cwrap_header = """// {0} ...@@ -954,6 +954,7 @@ cwrap_header = """// {0}
#include <vector> #include <vector>
#include <string> #include <string>
#include <utility> #include <utility>
#include <functional>
#ifndef M_PI #ifndef M_PI
#define M_PI (3.14159265358979323846) #define M_PI (3.14159265358979323846)
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <utility> #include <utility>
#include <functional>
#ifndef M_PI #ifndef M_PI
#define M_PI (3.14159265358979323846) #define M_PI (3.14159265358979323846)
......
...@@ -47,6 +47,7 @@ Notes: ...@@ -47,6 +47,7 @@ Notes:
Collection (GCC). To compile a C++ example with Microsoft Visual Studio 2017 Collection (GCC). To compile a C++ example with Microsoft Visual Studio 2017
in the Visual Studio shell and run it, you would do: in the Visual Studio shell and run it, you would do:
C:\gmsh-git-Windows64-sdk> ren include\gmsh.h gmsh.h_original
C:\gmsh-git-Windows64-sdk> ren include\gmsh.h_cwrap gmsh.h C:\gmsh-git-Windows64-sdk> ren include\gmsh.h_cwrap gmsh.h
C:\gmsh-git-Windows64-sdk> cl /Iinclude share\doc\gmsh\tutorial\c++\t1.cpp lib\gmsh.lib C:\gmsh-git-Windows64-sdk> cl /Iinclude share\doc\gmsh\tutorial\c++\t1.cpp lib\gmsh.lib
C:\gmsh-git-Windows64-sdk> cd lib C:\gmsh-git-Windows64-sdk> cd lib
......
...@@ -570,7 +570,7 @@ default value: @code{6371000} ...@@ -570,7 +570,7 @@ default value: @code{6371000}
@end table @end table
@item MathEval @item MathEval
Evaluate a mathematical expression. The expression can contain x, y, z for spatial coordinates, F0, F1, ... for field values, and and mathematical functions.@* Evaluate a mathematical expression. The expression can contain x, y, z for spatial coordinates, F0, F1, ... for field values, and mathematical functions.@*
Options:@* Options:@*
@table @code @table @code
@item F @item F
...@@ -580,7 +580,7 @@ default value: @code{"F2 + Sin(z)"} ...@@ -580,7 +580,7 @@ default value: @code{"F2 + Sin(z)"}
@end table @end table
@item MathEvalAniso @item MathEvalAniso
Evaluate a metric expression. The expressions can contain x, y, z for spatial coordinates, F0, F1, ... for field values, and and mathematical functions.@* Evaluate a metric expression. The expressions can contain x, y, z for spatial coordinates, F0, F1, ... for field values, and mathematical functions.@*
Options:@* Options:@*
@table @code @table @code
@item M11 @item M11
......
...@@ -38,12 +38,12 @@ Saved in: @code{General.OptionsFileName} ...@@ -38,12 +38,12 @@ Saved in: @code{General.OptionsFileName}
@item General.BuildInfo @item General.BuildInfo
Gmsh build information (read-only)@* Gmsh build information (read-only)@*
Default value: @code{"Version: 4.8.0-git-392ddd331; License: GNU General Public License; Build OS: MacOSX-sdk; Build date: 20210301; Build host: MBP-Christophe; Build options: 64Bit ALGLIB ANN Bamg Blossom Cairo Cgns DIntegration Dlopen DomHex Eigen Fltk GMP Gmm Hxt Jpeg Kbipack MathEx Med Mesh Metis Mmg Mpeg Netgen ONELAB ONELABMetamodel OpenCASCADE OpenCASCADE-CAF OpenGL OpenMP OptHom Parasolid ParasolidSTEP Parser Plugins Png Post QuadTri Solver TetGen/BR TouchBar Voro++ Zlib; FLTK version: 1.4.0; OCC version: 7.6.0; MED version: 4.1.0; Packaged by: geuzaine; Web site: https://gmsh.info; Issue tracker: https://gitlab.onelab.info/gmsh/gmsh/issues"}@* Default value: @code{"Version: 4.8.2-git-f4a047dba; License: GNU General Public License; Build OS: MacOSX-sdk; Build date: 20210326; Build host: Mac-mini.local; Build options: 64Bit ALGLIB ANN Bamg Blossom DIntegration Dlopen DomHex Eigen Fltk Gmm Hxt Jpeg[fltk] Kbipack MathEx Mesh Metis Mpeg Netgen ONELAB ONELABMetamodel OpenGL OptHom Parser Plugins Png[fltk] Post QuadMeshingTools QuadTri Solver TetGen/BR TouchBar Voro++ Zlib; FLTK version: 1.4.0; Packaged by: geuzaine; Web site: https://gmsh.info; Issue tracker: https://gitlab.onelab.info/gmsh/gmsh/issues"}@*
Saved in: @code{-} Saved in: @code{-}
@item General.BuildOptions @item General.BuildOptions
Gmsh build options (read-only)@* Gmsh build options (read-only)@*
Default value: @code{"64Bit ALGLIB ANN Bamg Blossom Cairo Cgns DIntegration Dlopen DomHex Eigen Fltk GMP Gmm Hxt Jpeg Kbipack MathEx Med Mesh Metis Mmg Mpeg Netgen ONELAB ONELABMetamodel OpenCASCADE OpenCASCADE-CAF OpenGL OpenMP OptHom Parasolid ParasolidSTEP Parser Plugins Png Post QuadTri Solver TetGen/BR TouchBar Voro++ Zlib"}@* Default value: @code{"64Bit ALGLIB ANN Bamg Blossom DIntegration Dlopen DomHex Eigen Fltk Gmm Hxt Jpeg[fltk] Kbipack MathEx Mesh Metis Mpeg Netgen ONELAB ONELABMetamodel OpenGL OptHom Parser Plugins Png[fltk] Post QuadMeshingTools QuadTri Solver TetGen/BR TouchBar Voro++ Zlib"}@*
Saved in: @code{-} Saved in: @code{-}
@item General.DefaultFileName @item General.DefaultFileName
...@@ -168,7 +168,7 @@ Saved in: @code{General.SessionFileName} ...@@ -168,7 +168,7 @@ Saved in: @code{General.SessionFileName}
@item General.Version @item General.Version
Gmsh version (read-only)@* Gmsh version (read-only)@*
Default value: @code{"4.8.0-git-392ddd331"}@* Default value: @code{"4.8.2-git-f4a047dba"}@*
Saved in: @code{-} Saved in: @code{-}
@item General.WatchFilePattern @item General.WatchFilePattern
......
...@@ -21,6 +21,7 @@ associated header file (`gmsh.h'). These can be either obtained ...@@ -21,6 +21,7 @@ associated header file (`gmsh.h'). These can be either obtained
For example, to compile a C++ example with Microsoft Visual Studio 2017 in the For example, to compile a C++ example with Microsoft Visual Studio 2017 in the
Visual Studio shell: Visual Studio shell:
C:\gmsh-git-Windows64-sdk> ren include\gmsh.h gmsh.h_original
C:\gmsh-git-Windows64-sdk> ren include\gmsh.h_cwrap gmsh.h C:\gmsh-git-Windows64-sdk> ren include\gmsh.h_cwrap gmsh.h
C:\gmsh-git-Windows64-sdk> cl /Iinclude share\doc\gmsh\tutorial\c++\t1.cpp lib\gmsh.lib C:\gmsh-git-Windows64-sdk> cl /Iinclude share\doc\gmsh\tutorial\c++\t1.cpp lib\gmsh.lib
C:\gmsh-git-Windows64-sdk> cd lib C:\gmsh-git-Windows64-sdk> cd lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment