From e595cc49f2655718f5e6202b8e3c4dde273bb692 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 13 Feb 2026 11:50:04 -0600 Subject: [PATCH] FEM: Update netgenplugin src files to fix builds with netgen >= 6.2.2601 (#27508) --- .../salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp | 6 +++++- .../salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp index 2d43a3e08d..9676d2f209 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp @@ -126,7 +126,11 @@ namespace netgen { #endif //extern void OCCSetLocalMeshSize(OCCGeometry & geom, Mesh & mesh); DLL_HEADER extern MeshingParameters mparam; - DLL_HEADER extern volatile multithreadt multithread; +#if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2,2601) + using ngcore::multithread; +#else + DLL_HEADER extern volatile multithreadt multithread; +#endif DLL_HEADER extern bool merge_solids; } diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp index e391249b67..9271cebaa4 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp @@ -112,7 +112,11 @@ namespace netgen { DLL_HEADER extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*); #endif DLL_HEADER extern MeshingParameters mparam; - DLL_HEADER extern volatile multithreadt multithread; +#if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2,2601) + using ngcore::multithread; +#else + DLL_HEADER extern volatile multithreadt multithread; +#endif } using namespace nglib; using namespace std;