X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=4f9a3179de48cf7e9b425b6dcb5000816a2ef536;hp=d889e1d999809fde2be074ad3eb09fcb8a2ced83;hb=HEAD;hpb=9afcd890f59bc3177fa74c7c0a454cc618f713bf diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index d889e1d99..b831998d5 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -49,9 +49,8 @@ #include #include -#ifndef DISABLE_PSMESH +#ifndef WIN32 #include -#include #endif #include @@ -395,19 +394,10 @@ class SMESH_EXPORT SMESH_Mesh virtual void Lock(){}; virtual void Unlock(){}; - virtual int GetNbThreads(){return 0;}; - virtual void SetNbThreads(long nbThreads){(void) nbThreads;}; + virtual void wait(){}; - virtual void InitPoolThreads(){std::cout << "Should not pass here: InitPoolThread" << std::endl;}; - virtual void DeletePoolThreads(){std::cout << "Should not pass here: DeletePoolThread" << std::endl;}; - virtual void wait(){std::cout << "Should not pass here: wait" << std::endl;}; - - virtual bool IsParallel(){std::cout << "Should not pass here: IsParallel" << std::endl;return false;}; - -#ifndef DISABLE_PSMESH - virtual boost::filesystem::path GetTmpFolder() {return "";}; - virtual boost::asio::thread_pool* GetPool() {return NULL;}; -#endif + virtual bool IsParallel(){throw SALOME_Exception("Calling SMESH_Mesh::IsParallel");return false;}; + virtual int GetParallelElement(){throw SALOME_Exception("Calling SMESH_Mesh::GetParallelElement");return 0;}; virtual bool ComputeSubMeshes( SMESH_Gen* gen, @@ -419,7 +409,7 @@ class SMESH_EXPORT SMESH_Mesh SMESH_subMesh::compute_event &computeEvent, const bool includeSelf, const bool complexShapeFirst, - const bool aShapeOnly){(void) gen;(void) aMesh;(void) aShape;(void) aDim;(void) aShapesId;(void) allowedSubShapes;(void) computeEvent;(void) includeSelf;(void) complexShapeFirst;(void) aShapeOnly;std::cout << "Should not pass here: computesubmesh" << std::endl;return false;}; + const bool aShapeOnly){(void) gen;(void) aMesh;(void) aShape;(void) aDim;(void) aShapesId;(void) allowedSubShapes;(void) computeEvent;(void) includeSelf;(void) complexShapeFirst;(void) aShapeOnly;throw SALOME_Exception("Calling SMESH_Mesh::ComputeSubMeshes");return false;}; private: @@ -467,12 +457,6 @@ protected: // 2) to forget not loaded mesh data at hyp modification TCallUp* _callUp; - // Mutex for multhitreading write in SMESH_Mesh -#ifndef DISABLE_PSMESH - boost::mutex _my_lock; -#endif - int _NbThreads=-1; - protected: SMESH_Mesh(); SMESH_Mesh(const SMESH_Mesh&) {};