Corrections for Windows compilation

diff --git a/src/SMESH/SMESH_DriverShape.cxx b/src/SMESH/SMESH_DriverShape.cxx
index 5568a26107d72dc8f3826a0e038e0fb583cd91da..678e2c8fd9bd9846b5fd580bac81478309e1ee41 100644 (file)
--- a/src/SMESH/SMESH_DriverShape.cxx
+++ b/src/SMESH/SMESH_DriverShape.cxx
@@ -158,6 +158,8 @@ int importShape(const std::string shape_file, TopoDS_Shape& aShape){
   } else {
     throw SALOME_Exception("Unknow format for importShape: " + type);
   }
+#else
+  return 0;
 #endif
 }
 
@@ -180,5 +182,7 @@ int exportShape(const std::string shape_file, const TopoDS_Shape& aShape){
   } else {
     throw SALOME_Exception("Unknow format for exportShape: " + type);
   }
+#else
+  return 0;
 #endif
 }

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index a7abda6dbd11366647ecf8b19a85da36d967f795..6212a0c23254037229bdc84aa1acea85b7c59363 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -7042,7 +7042,7 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
  * \brief Set the number of threads for a parallel computation
  */
 //=============================================================================
-void SMESH_Mesh_i::SetNbThreads(int nbThreads){
+ void SMESH_Mesh_i::SetNbThreads(long nbThreads){
   _impl->SetNbThreads(nbThreads);
 }
 

diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx
index 25892ca9d9fcf21fc72ca0e3b2bf496eb54e5280..b694fdc46898077e40b66e7a0c8259021bfca2ed 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -673,7 +673,7 @@ private:
                         SMESH::submesh_array_array& theSubMeshOrder,
                         const bool                  theIsDump);
 
-  void SetNbThreads(int nbThreads);
+  void SetNbThreads(long nbThreads);
 
   /*!
    * \brief Finds concurrent sub-meshes