From 64303e25ab53bd88e9cdc6287c3c3cf5b21acce9 Mon Sep 17 00:00:00 2001 From: abd Date: Mon, 14 Aug 2006 08:03:01 +0000 Subject: [PATCH] Fix compilation on LInux --- src/GUI/NETGENPluginGUI_HypothesisCreator.h | 2 +- src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h index 77c0fcc..3cbd96a 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h @@ -35,7 +35,7 @@ #define NETGENPLUGIN_GUI_EXPORT __declspec( dllimport ) #endif #else - #define NETGENPLUGIN_GUI_EXPORTT + #define NETGENPLUGIN_GUI_EXPORT #endif #include diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index de8dadd..83fd8de 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -70,7 +70,11 @@ NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESHDS_Mesh* meshDS, _isVolume(isVolume), _optimize(true) { +#ifdef WNT netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters(); +#else + netgen::MeshingParameters& mparams = netgen::mparam; +#endif // Initialize global NETGEN parameters by default values: // maximal mesh edge size mparams.maxh = NETGENPlugin_Hypothesis::GetDefaultMaxSize(); @@ -98,7 +102,11 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp) { if (hyp) { +#ifdef WNT netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters(); +#else + netgen::MeshingParameters& mparams = netgen::mparam; +#endif // Initialize global NETGEN parameters: // maximal mesh segment size mparams.maxh = hyp->GetMaxSize(); @@ -149,7 +157,11 @@ Standard_Boolean IsEqual(const Link& aLink1, const Link& aLink2) //============================================================================= bool NETGENPlugin_Mesher::Compute() { +#ifdef WNT netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters(); +#else + netgen::MeshingParameters& mparams = netgen::mparam; +#endif MESSAGE("Compute with:\n" " max size = " << mparams.maxh << "\n" " segments per edge = " << mparams.segmentsperedge); -- 2.39.2