From 57c1f8af176820a2d798c95485161b85d7b22133 Mon Sep 17 00:00:00 2001 From: Yoann Audouin Date: Tue, 8 Nov 2022 08:35:20 +0100 Subject: [PATCH] Corrections for Windows compilation --- src/SMESH/SMESH_DriverShape.cxx | 4 ++++ src/SMESH_I/SMESH_Mesh_i.cxx | 2 +- src/SMESH_I/SMESH_Mesh_i.hxx | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/SMESH/SMESH_DriverShape.cxx b/src/SMESH/SMESH_DriverShape.cxx index 5568a2610..678e2c8fd 100644 --- 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 a7abda6db..6212a0c23 100644 --- 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 25892ca9d..b694fdc46 100644 --- 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 -- 2.39.2