]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
Porting to latest TBB on Windows.
authorrnv <rnv@opencascade.com>
Fri, 30 Aug 2019 15:48:46 +0000 (18:48 +0300)
committerrnv <rnv@opencascade.com>
Fri, 30 Aug 2019 15:48:46 +0000 (18:48 +0300)
src/SMESHDS/SMESHDS_GroupOnFilter.cxx
src/StdMeshers/StdMeshers_Cartesian_3D.cxx

index 7e1c79097bef9e8f2403827c60f1cc487df50aa7..93d3796eaba8ab95ef1c0039e631875f2d0d90d2 100644 (file)
@@ -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"
 
index f54caa26215a091f6b07243301da15dc9d3459d3..85a984c309ac5078ab5aa9c4ab15aadada50d6e2 100644 (file)
 
 //#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