0021948]: EDF SMESH : Memory is not freed when deleting a mesh

Move declaration of GEOM::GEOM_Object_wrap form
  GEOMBase/GEOM_GenericObjPtr.h to GEOM_I/GEOM_wrap.hxx as GEOMBase is
  a part of GUI

-#include <GEOM_GenericObjPtr.h>
+#include <GEOM_wrap.hxx>
This commit is contained in:
eap 2012-12-24 13:58:17 +00:00
parent 75be4ee0eb
commit 414745da0e
10 changed files with 12 additions and 11 deletions

View File

@ -33,7 +33,7 @@
#include <SMESHGUI_Utils.h>
#include <boost/shared_ptr.hpp>
#include <GEOMImpl_Types.hxx>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
#include <TopoDS.hxx>
#include <BRep_Tool.hxx>

View File

@ -41,7 +41,7 @@
// SALOME GEOM includes
#include <GEOMBase.h>
#include <GEOM_Actor.h>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
// SALOME GUI includes
#include <LightApp_SelectionMgr.h>

View File

@ -30,7 +30,7 @@
// SALOME GEOM includes
#include <GeometryGUI.h>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
// SALOME KERNEL includes
#include <SALOMEDS_SObject.hxx>

View File

@ -44,7 +44,7 @@
// SALOME GEOM includes
#include <GEOMBase.h>
#include <GEOM_SelectionFilter.h>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
// SALOME GUI includes
#include <QtxColorButton.h>

View File

@ -33,7 +33,7 @@
#include <GeometryGUI.h>
#include <GEOM_SelectionFilter.h>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
#include <SUIT_Session.h>
#include <SUIT_OverrideCursor.h>

View File

@ -40,7 +40,7 @@
#include <GEOM_SelectionFilter.h>
#include <GEOMBase.h>
#include <GeometryGUI.h>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
// SALOME GUI includes
#include <SalomeApp_Tools.h>

View File

@ -40,7 +40,7 @@
// SALOME GEOM includes
#include <GEOMBase.h>
#include <GeometryGUI.h>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
// SALOME GUI includes
#include <LightApp_DataOwner.h>

View File

@ -119,7 +119,7 @@
// helpers about SALOME::GenericObj
#include <SALOMEDS_wrap.hxx>
#include <SALOMEDS_Attributes_wrap.hxx>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
#include <map>
#include <fstream>
@ -2150,7 +2150,8 @@ SMESH_Gen_i::FindGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh,
}
if ( geom->_is_nil() ) {
// explode
GEOM::ShapesOpPtr op = geomGen->GetIShapesOperations( GetCurrentStudyID() );
GEOM::GEOM_IShapesOperations_wrap op =
geomGen->GetIShapesOperations( GetCurrentStudyID() );
if ( !op->_is_nil() )
geom = op->GetSubShape( mainShape, shapeID );
}

View File

@ -60,7 +60,7 @@
#include <utilities.h>
#include <GEOMImpl_Types.hxx>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
// OCCT Includes
#include <BRep_Builder.hxx>

View File

@ -42,7 +42,7 @@
#include <SALOMEDSClient_Study.hxx>
#include <GEOM_GenericObjPtr.h>
#include <GEOM_wrap.hxx>
// SALOME GUI includes
#include <SUIT_ResourceMgr.h>