X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Interface.h;h=27b8220129d590ed378e3f818b0f6c8932446c18;hb=bdbfb368d71ed11cc0391354a7d86c880cd94949;hp=49db964fc715e995c1495ec72bfaf704fbaa05bd;hpb=3af53fdb27a2f546f9acd8dfe2fa2343213fe7cc;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index 49db964fc..27b822012 100644
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -9,38 +9,59 @@
 
 #include <GeomAPI.h>
 
+#include <memory>
+
 /**\class GeomAPI_Interface
  * \ingroup DataModel
  * \brief General base class for all interfaces in this package
  */
 
-class GEOMAPI_EXPORT GeomAPI_Interface
+template <typename T>
+void GeomAPI_deleter( void* p ) {
+   delete reinterpret_cast<T*>(p);
+}
+
+class GeomAPI_Interface
 {
- protected:
-  void* myImpl;  ///< pointer to the internal impl object
+ private:
+  std::shared_ptr<char> myImpl;  ///< pointer to the internal impl object
 
  public:
   /// None - constructor
-  GeomAPI_Interface();
+  GEOMAPI_EXPORT GeomAPI_Interface();
 
   /// Constructor by the impl pointer (used for internal needs)
-  GeomAPI_Interface(void* theImpl);
+  template<class T> explicit GeomAPI_Interface(T* theImpl)
+  {
+    myImpl = std::shared_ptr<char>(reinterpret_cast<char*>(theImpl), GeomAPI_deleter<T>);
+  }
 
   /// Destructor
-  virtual ~GeomAPI_Interface();
+  GEOMAPI_EXPORT virtual ~GeomAPI_Interface();
 
   /// Returns the pointer to the impl
   template<class T> inline T* implPtr()
   {
-    return static_cast<T*>(myImpl);
+    return reinterpret_cast<T*>(myImpl.get());
+  }
+  /// Returns the pointer to the impl
+  template<class T> inline const T* implPtr() const
+  {
+    return reinterpret_cast<T*>(myImpl.get());
   }
   /// Returns the reference object of the impl
   template<class T> inline const T& impl() const
   {
-    return *(static_cast<T*>(myImpl));
+    return *(reinterpret_cast<T*>(myImpl.get()));
   }
   /// Updates the impl (deletes the old one)
-  void setImpl(void* theImpl);
+  template<class T> inline void setImpl(T* theImpl)
+  {
+    myImpl = std::shared_ptr<char>(reinterpret_cast<char*>(theImpl), GeomAPI_deleter<T>);
+  }
+
+  /// Returns true if the impl is empty
+  GEOMAPI_EXPORT bool empty() const;
 };
 
 #endif