From: rnv <rnv@opencascade.com>
Date: Fri, 30 Aug 2019 15:48:46 +0000 (+0300)
Subject: Porting to latest TBB on Windows.
X-Git-Tag: V9_4_0a1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=46f1ca0181a2ab53d7d3b3f7e7d830206132e013;p=modules%2Fsmesh.git

Porting to latest TBB on Windows.
---

diff --git a/src/SMESHDS/SMESHDS_GroupOnFilter.cxx b/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
index 7e1c79097..93d3796ea 100644
--- a/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
@@ -395,6 +395,14 @@ void SMESHDS_GroupOnFilter::update() const
 //================================================================================
 #ifdef WITH_TBB
 
+#ifdef WIN32
+// See https://docs.microsoft.com/en-gb/cpp/porting/modifying-winver-and-win32-winnt?view=vs-2019
+// Windows 10 = 0x0A00  
+#define WINVER 0x0A00
+#define _WIN32_WINNT 0x0A00
+
+#endif
+
 #include <tbb/parallel_for.h>
 #include "tbb/enumerable_thread_specific.h"
 
diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
index f54caa262..85a984c30 100644
--- a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx
@@ -91,6 +91,15 @@
 
 //#undef WITH_TBB
 #ifdef WITH_TBB
+
+#ifdef WIN32
+// See https://docs.microsoft.com/en-gb/cpp/porting/modifying-winver-and-win32-winnt?view=vs-2019
+// Windows 10 = 0x0A00  
+#define WINVER 0x0A00
+#define _WIN32_WINNT 0x0A00
+
+#endif
+
 #include <tbb/parallel_for.h>
 //#include <tbb/enumerable_thread_specific.h>
 #endif