Explicit inclusion of NewGEOM and STL headers in SWIG to avoid memory leaks.

diff --git a/src/GeomAPI/GeomAPI.i b/src/GeomAPI/GeomAPI.i
index 99ff18f0231f723c38e3e43f3df16ce8dda1a5ee..25c752b6135b5b2e1390d9869bb012e0abdfc052 100644 (file)
--- a/src/GeomAPI/GeomAPI.i
+++ b/src/GeomAPI/GeomAPI.i
@@ -21,6 +21,9 @@
   #include "GeomAPI_Pnt.h"
   #include "GeomAPI_XY.h"
   #include "GeomAPI_XYZ.h"
+
+  #include <memory>
+  #include <string>
 %}
 
 // to avoid error on this

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI.i b/src/GeomAlgoAPI/GeomAlgoAPI.i
index 4a1b94eda26a22cb49054ef3f7cca3807457a491..18d82cbcf25771b9270fbd65d9183f49b08ff4bc 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI.i
+++ b/src/GeomAlgoAPI/GeomAlgoAPI.i
@@ -11,6 +11,10 @@
   #include "GeomAlgoAPI_MakeShape.h"
   #include "GeomAlgoAPI_PointBuilder.h"
   #include "GeomAlgoAPI_SketchBuilder.h"
+
+  #include <memory>
+  #include <string>
+  #include <list>
 %}
 
 // to avoid error on this

diff --git a/src/GeomDataAPI/GeomDataAPI.i b/src/GeomDataAPI/GeomDataAPI.i
index 98496183ef39a34639d9f1315577b49001cd04af..24da73652b8bbf0ddb185b9a499c39802f8940c1 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI.i
+++ b/src/GeomDataAPI/GeomDataAPI.i
@@ -6,6 +6,10 @@
   #include "GeomDataAPI_Point.h"
   #include "GeomDataAPI_Dir.h"
   #include "GeomDataAPI_Point2D.h"
+
+  #include <memory>
+  #include <string>
+  #include <list>
   
   template<class T> std::shared_ptr<T> castTo(std::shared_ptr<ModelAPI_Attribute> theObject) 
   { 

diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i
index ff4b9e7adaea62d7dc512f267b4ae77030c84cbc..77a0f42e09d794b5b2151713114e69ee153cbc7c 100644 (file)
--- a/src/ModelAPI/ModelAPI.i
+++ b/src/ModelAPI/ModelAPI.i
@@ -9,8 +9,6 @@
 }
 
 %{
-  #include "GeomAPI_Interface.h"
-  #include "GeomAPI_Shape.h"
   #include "ModelAPI.h"
   #include "ModelAPI_Document.h"
   #include "ModelAPI_Session.h"
@@ -40,6 +38,9 @@
   #include "ModelAPI_ResultParameters.h"
   #include "ModelAPI_ResultGroup.h"
   #include "ModelAPI_Tools.h"
+
+  #include <memory>
+  #include <string>
   
   template<class T1, class T2> 
   std::shared_ptr<T1> shared_ptr_cast(std::shared_ptr<T2> theObject)
@@ -51,10 +52,10 @@
 
 // to avoid error on this
 #define MODELAPI_EXPORT
-#define GEOMAPI_EXPORT
 
 // standard definitions
 %include "typemaps.i"
+%include "GeomAPI.i"
 %include "std_string.i"
 %include "std_list.i"
 %include "std_shared_ptr.i"
@@ -68,8 +69,6 @@
 
 // shared pointers
 // For ModelAPI_ResultConstruction.shape()
-%shared_ptr(GeomAPI_Interface)
-%shared_ptr(GeomAPI_Shape)
 %shared_ptr(ModelAPI_Document)
 %shared_ptr(ModelAPI_Session)
 %shared_ptr(ModelAPI_Plugin)
@@ -99,8 +98,6 @@
 %shared_ptr(ModelAPI_ResultParameters)
 
 // all supported interfaces
-%include "GeomAPI_Interface.h"
-%include "GeomAPI_Shape.h"
 %include "ModelAPI_Document.h"
 %include "ModelAPI_Session.h"
 %include "ModelAPI_Plugin.h"