From 414745da0ea156072e608c41825eb11890bbb4b2 Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Mon, 24 Dec 2012 13:58:17 +0000
Subject: [PATCH] 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>
---
 src/PluginUtils/GeomSelectionTools.cxx                   | 2 +-
 src/SMESHGUI/SMESHGUI_ComputeDlg.cxx                     | 2 +-
 src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx                   | 2 +-
 src/SMESHGUI/SMESHGUI_GroupDlg.cxx                       | 2 +-
 src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx                | 2 +-
 src/SMESHGUI/SMESHGUI_MeshOp.cxx                         | 2 +-
 src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx                 | 2 +-
 src/SMESH_I/SMESH_Gen_i.cxx                              | 5 +++--
 src/SMESH_I/SMESH_Mesh_i.cxx                             | 2 +-
 src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx | 2 +-
 10 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/PluginUtils/GeomSelectionTools.cxx b/src/PluginUtils/GeomSelectionTools.cxx
index 2f495237c..cfb841f5c 100644
--- a/src/PluginUtils/GeomSelectionTools.cxx
+++ b/src/PluginUtils/GeomSelectionTools.cxx
@@ -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>
diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index b077d7336..1d5555e7e 100644
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@ -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>
diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index 37f13c33d..c0daa7005 100644
--- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
@@ -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>
diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index bc27fbb69..e7eccaee7 100644
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -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>
diff --git a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
index 50f3bbacc..2b797a421 100644
--- a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
@@ -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>
diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index 3252838e7..00ad90ec5 100644
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -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>
diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index e83ee56e2..38df65d1d 100644
--- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@ -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>
diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 4b2669601..8fb303ad3 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -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 );
         }
diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 426ece549..dde636000 100644
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -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>
diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
index ac7fa4dfa..1e5234d6b 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
@@ -42,7 +42,7 @@
 
 #include <SALOMEDSClient_Study.hxx>
 
-#include <GEOM_GenericObjPtr.h>
+#include <GEOM_wrap.hxx>
 
 // SALOME GUI includes
 #include <SUIT_ResourceMgr.h>