X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_subMesh.cxx;h=86da9d3a0dfbf5c6a8be79f26242592b881a2587;hp=ef34015fe1b2805d8b0c6711ad7b3a527380596c;hb=9e9e56ba2677f1b35f0ab2877b9ef95b29dcf34d;hpb=b22070beb1078d4b4e3c92ace635ef59bd7fbd61 diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx index ef34015fe..86da9d3a0 100644 --- a/src/SMESH/SMESH_subMesh.cxx +++ b/src/SMESH/SMESH_subMesh.cxx @@ -53,7 +53,7 @@ #include #include -#include +#include #include using namespace std; @@ -1400,6 +1400,20 @@ bool SMESH_subMesh::ComputeStateEngine(int event) if ( !ret ) _computeError = algo->GetComputeError(); } + catch ( std::bad_alloc& exc ) { + if ( _computeError ) { + _computeError->myName = COMPERR_MEMORY_PB; + //_computeError->myComment = exc.what(); + } + throw exc; + } + catch ( Standard_OutOfMemory& exc ) { + if ( _computeError ) { + _computeError->myName = COMPERR_MEMORY_PB; + //_computeError->myComment = exc.what(); + } + throw exc; + } catch (Standard_Failure& exc) { if ( !_computeError ) _computeError = SMESH_ComputeError::New(); _computeError->myName = COMPERR_OCC_EXCEPTION; @@ -1410,13 +1424,6 @@ bool SMESH_subMesh::ComputeStateEngine(int event) _computeError->myName = COMPERR_SLM_EXCEPTION; _computeError->myComment = S_ex.what(); } - catch ( std::bad_alloc& exc ) { - if ( _computeError ) { - _computeError->myName = COMPERR_MEMORY_PB; - _computeError->myComment = exc.what(); - } - throw exc; - } catch ( std::exception& exc ) { if ( !_computeError ) _computeError = SMESH_ComputeError::New(); _computeError->myName = COMPERR_STD_EXCEPTION;