ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-06-06 03:07:48 +05:00
Code Issues Packages Projects Releases Wiki Activity

Replacing DISABLE_PARASMESH with WIN32

Browse Source
This commit is contained in:
Yoann Audouin 2022-10-26 16:20:19 +02:00
parent 185dd64d97
commit aed4aa79d0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESH/SMESH_Gen.cxx
View File

@ -28,7 +28,7 @@
//#define CHRONODEF //#define CHRONODEF
// //
#ifndef DISABLE_PARAMESH #ifndef WIN32
#include <boost/asio.hpp> #include <boost/asio.hpp>
#endif #endif
#include "SMESH_Gen.hxx" #include "SMESH_Gen.hxx"
@ -350,7 +350,7 @@ bool SMESH_Gen::parallelComputeSubMeshes(
smToCompute->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); smToCompute->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
continue; continue;
} }
#ifdef DISABLE_PARASMESH #ifdef WIN32
compute_function(smToCompute, computeEvent, compute_function(smToCompute, computeEvent,
shapeSM, aShapeOnly, allowedSubShapes, shapeSM, aShapeOnly, allowedSubShapes,
aShapesId); aShapesId);

2
src/SMESH/SMESH_Mesh.cxx
View File

@ -239,7 +239,7 @@ SMESH_Mesh::~SMESH_Mesh()
int result=pthread_create(&thread, NULL, deleteMeshDS, (void*)_meshDS); int result=pthread_create(&thread, NULL, deleteMeshDS, (void*)_meshDS);
#endif #endif
} }
#ifndef DISABLE_PARASMESH #ifndef WIN32
if(_pool) if(_pool)
DeletePoolThreads(); DeletePoolThreads();
#endif #endif

8
src/SMESH/SMESH_Mesh.hxx
View File

@ -50,7 +50,7 @@
#include <ostream> #include <ostream>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#ifndef DISABLE_PARASMESH #ifndef WIN32
#include <boost/asio/thread_pool.hpp> #include <boost/asio/thread_pool.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#endif #endif
@ -391,7 +391,7 @@ class SMESH_EXPORT SMESH_Mesh
// Parallel computation functions // Parallel computation functions
#ifdef DISABLE_PARASMESH #ifdef WIN32
void Lock() {}; void Lock() {};
void Unlock() {}; void Unlock() {};
@ -420,7 +420,7 @@ class SMESH_EXPORT SMESH_Mesh
// Temporary folder used during parallel Computation // Temporary folder used during parallel Computation
boost::filesystem::path tmp_folder; boost::filesystem::path tmp_folder;
#ifndef DISABLE_PARASMESH #ifndef WIN32
boost::asio::thread_pool * _pool = nullptr; //thread pool for computation boost::asio::thread_pool * _pool = nullptr; //thread pool for computation
#endif #endif
@ -472,7 +472,7 @@ protected:
TCallUp* _callUp; TCallUp* _callUp;
// Mutex for multhitreading write in SMESH_Mesh // Mutex for multhitreading write in SMESH_Mesh
#ifndef DISABLE_PARASMESH #ifndef WIN32
boost::mutex _my_lock; boost::mutex _my_lock;
#endif #endif
int _NbThreads=0; int _NbThreads=0;