install mydefs.hpp, some DLL_HEADER

Includes parts of pull request by looooo
https://github.com/NGSolve/netgen/pull/4
This commit is contained in:
Matthias Hochsteger 2018-01-23 09:01:58 +01:00
parent 9d3360a9a2
commit 0b411e1b07
5 changed files with 10 additions and 9 deletions

View File

@ -1,4 +1,4 @@
install(FILES nginterface.h nginterface_v2.hpp DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel) install(FILES nginterface.h nginterface_v2.hpp mydefs.hpp DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel)
install(FILES install(FILES
acisgeom.hpp csg.hpp geometry2d.hpp gprim.hpp incopengl.hpp acisgeom.hpp csg.hpp geometry2d.hpp gprim.hpp incopengl.hpp

View File

@ -349,7 +349,7 @@ namespace netgen
void SetDimension (int dim) { dimension = dim; } void SetDimension (int dim) { dimension = dim; }
/// sets internal tables /// sets internal tables
void CalcSurfacesOfNode (); DLL_HEADER void CalcSurfacesOfNode ();
/// additional (temporarily) fix points /// additional (temporarily) fix points
void FixPoints (const BitArray & fixpoints); void FixPoints (const BitArray & fixpoints);

View File

@ -383,13 +383,13 @@ namespace netgen
Element2d & operator= (const Element2d &) = default; Element2d & operator= (const Element2d &) = default;
Element2d & operator= (Element2d &&) = default; Element2d & operator= (Element2d &&) = default;
/// ///
Element2d (int anp); DLL_HEADER Element2d (int anp);
/// ///
DLL_HEADER Element2d (ELEMENT_TYPE type); DLL_HEADER Element2d (ELEMENT_TYPE type);
/// ///
Element2d (int pi1, int pi2, int pi3); DLL_HEADER Element2d (int pi1, int pi2, int pi3);
/// ///
Element2d (int pi1, int pi2, int pi3, int pi4); DLL_HEADER Element2d (int pi1, int pi2, int pi3, int pi4);
/// ///
ELEMENT_TYPE GetType () const { return typ; } ELEMENT_TYPE GetType () const { return typ; }
/// ///

View File

@ -244,7 +244,7 @@ namespace netgen
} }
virtual void Save (string filename) const; DLL_HEADER virtual void Save (string filename) const;
DLL_HEADER void BuildFMap(); DLL_HEADER void BuildFMap();
@ -275,7 +275,7 @@ namespace netgen
return OCCSurface (TopoDS::Face(fmap(surfi)), PLANESPACE); return OCCSurface (TopoDS::Face(fmap(surfi)), PLANESPACE);
} }
void CalcBoundingBox (); DLL_HEADER void CalcBoundingBox ();
DLL_HEADER void BuildVisualizationMesh (double deflection); DLL_HEADER void BuildVisualizationMesh (double deflection);
void RecursiveTopologyTree (const TopoDS_Shape & sh, void RecursiveTopologyTree (const TopoDS_Shape & sh,
@ -440,7 +440,7 @@ namespace netgen
// Philippose - 31.09.2009 // Philippose - 31.09.2009
// External access to the mesh generation functions within the OCC // External access to the mesh generation functions within the OCC
// subsystem (Not sure if this is the best way to implement this....!!) // subsystem (Not sure if this is the best way to implement this....!!)
extern int OCCGenerateMesh (OCCGeometry & occgeometry, shared_ptr<Mesh> & mesh, DLL_HEADER extern int OCCGenerateMesh (OCCGeometry & occgeometry, shared_ptr<Mesh> & mesh,
MeshingParameters & mparam); MeshingParameters & mparam);
DLL_HEADER extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh); DLL_HEADER extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh);

View File

@ -4,6 +4,7 @@
#define FILE_OCCMESHSURF #define FILE_OCCMESHSURF
#include "occgeom.hpp" #include "occgeom.hpp"
#include "mydefs.hpp"
#define PARAMETERSPACE -1 #define PARAMETERSPACE -1
#define PLANESPACE 1 #define PLANESPACE 1
@ -169,7 +170,7 @@ public:
class OCCGeometry; class OCCGeometry;
class OCCRefinementSurfaces : public Refinement class DLL_HEADER OCCRefinementSurfaces : public Refinement
{ {
const OCCGeometry & geometry; const OCCGeometry & geometry;