ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-09-22 18:52:51 +05:00
Code Issues Packages Projects Releases Wiki Activity

do not catch CORBA exceptions thrown by SMESH_Mesh_i

Browse Source
This commit is contained in:
eap 2014-02-17 17:10:11 +04:00
parent bf7367a22f
commit 7a732fc9d1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -81,8 +81,6 @@
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopoDS_Compound.hxx> #include <TopoDS_Compound.hxx>
#include "SMESH_TryCatch.hxx" // include after OCCT headers!
// STL Includes // STL Includes
#include <algorithm> #include <algorithm>
#include <string> #include <string>
@ -91,6 +89,11 @@
#include <sys/stat.h> #include <sys/stat.h>
// to pass CORBA exception through SMESH_TRY
#define SMY_OWN_CATCH catch( SALOME::SALOME_Exception& se ) { throw se; }
#include "SMESH_TryCatch.hxx" // include after OCCT headers!
#ifdef _DEBUG_ #ifdef _DEBUG_
static int MYDEBUG = 0; static int MYDEBUG = 0;
#else #else
@ -1504,7 +1507,7 @@ SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups,
if ( aType == SMESH::ALL ) if ( aType == SMESH::ALL )
aType = aGrp->GetType(); aType = aGrp->GetType();
else if ( aType != aGrp->GetType() ) else if ( aType != aGrp->GetType() )
THROW_SALOME_CORBA_EXCEPTION("UnionListOfGroups(): different group types", THROW_SALOME_CORBA_EXCEPTION("CreateDimGroup(): different group types",
SALOME::BAD_PARAM); SALOME::BAD_PARAM);
if ( SMESH_GroupBase_i* grp_i = SMESH::DownCast< SMESH_GroupBase_i* >( aGrp )) if ( SMESH_GroupBase_i* grp_i = SMESH::DownCast< SMESH_GroupBase_i* >( aGrp ))
if ( SMESHDS_GroupBase* grpDS = grp_i->GetGroupDS() ) if ( SMESHDS_GroupBase* grpDS = grp_i->GetGroupDS() )
@ -1522,7 +1525,7 @@ SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups,
if ( CORBA::is_nil( aGrp ) ) if ( CORBA::is_nil( aGrp ) )
continue; continue;
if ( aType != aGrp->GetType() ) if ( aType != aGrp->GetType() )
THROW_SALOME_CORBA_EXCEPTION("UnionListOfGroups(): different group types", THROW_SALOME_CORBA_EXCEPTION("CreateDimGroup(): different group types",
SALOME::BAD_PARAM); SALOME::BAD_PARAM);
if ( SMESH_GroupBase_i* grp_i = SMESH::DownCast< SMESH_GroupBase_i* >( aGrp )) if ( SMESH_GroupBase_i* grp_i = SMESH::DownCast< SMESH_GroupBase_i* >( aGrp ))
if ( SMESHDS_GroupBase* grpDS = grp_i->GetGroupDS() ) if ( SMESHDS_GroupBase* grpDS = grp_i->GetGroupDS() )