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

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index 1a605595b..27b822012 100644
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -1,37 +1,67 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAPI_Interface.hxx
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Interface_HeaderFile
-#define GeomAPI_Interface_HeaderFile
+#ifndef GeomAPI_Interface_H_
+#define GeomAPI_Interface_H_
 
 #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 implementation object
+ private:
+  std::shared_ptr<char> myImpl;  ///< pointer to the internal impl object
 
-public:
+ public:
   /// None - constructor
-  GeomAPI_Interface();
+  GEOMAPI_EXPORT GeomAPI_Interface();
+
+  /// Constructor by the impl pointer (used for internal needs)
+  template<class T> explicit GeomAPI_Interface(T* theImpl)
+  {
+    myImpl = std::shared_ptr<char>(reinterpret_cast<char*>(theImpl), GeomAPI_deleter<T>);
+  }
 
-  /// Constructor by the implementation pointer (used for internal needs)
-  GeomAPI_Interface(void* theImpl);
-  
   /// Destructor
-  virtual ~GeomAPI_Interface();
+  GEOMAPI_EXPORT virtual ~GeomAPI_Interface();
+
+  /// Returns the pointer to the impl
+  template<class T> inline T* implPtr()
+  {
+    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 *(reinterpret_cast<T*>(myImpl.get()));
+  }
+  /// Updates the impl (deletes the old one)
+  template<class T> inline void setImpl(T* theImpl)
+  {
+    myImpl = std::shared_ptr<char>(reinterpret_cast<char*>(theImpl), GeomAPI_deleter<T>);
+  }
 
-  /// Returns the pointer to the implementation
-  void* implementation();
-  /// Updates the implementation (deletes the old one)
-  void setImplementation(void* theImpl);
+  /// Returns true if the impl is empty
+  GEOMAPI_EXPORT bool empty() const;
 };
 
 #endif
-