X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Interface.h;h=fd5c83fce11ef200fe7d9faafa5a4e2dc534f143;hb=3d28bcbab2f3ed0e40295e64f4e836caebc19fca;hp=bd9a77ab13078880e6a961b4a9ab86df08e55900;hpb=6861e302bc1262afc17afc626b050295333a3af1;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index bd9a77ab1..fd5c83fce 100644
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -1,38 +1,62 @@
+// 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
+class GeomAPI_Interface
 {
-protected:
-  void* myImpl; ///< pointer to the internal impl object
+ private:
+  std::shared_ptr<void> 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)
-  GeomAPI_Interface(void* theImpl);
-  
+  template<class T> explicit GeomAPI_Interface(T* theImpl)
+  {
+    myImpl.reset(theImpl);
+  }
+
   /// Destructor
-  virtual ~GeomAPI_Interface();
+  GEOMAPI_EXPORT virtual ~GeomAPI_Interface();
 
   /// Returns the pointer to the impl
-  template<class T> inline T* implPtr() {return dynamic_cast<T*>(myImpl);}
+  template<class T> inline T* implPtr()
+  {
+    return static_cast<T*>(myImpl.get());
+  }
+  /// Returns the pointer to the impl
+  template<class T> inline const T* implPtr() const
+  {
+    return static_cast<T*>(myImpl.get());
+  }
   /// Returns the reference object of the impl
-  template<class T> inline const T& impl() {return *(static_cast<T*>(myImpl));}
+  template<class T> inline const T& impl() const
+  {
+    return *(static_cast<T*>(myImpl.get()));
+  }
   /// Updates the impl (deletes the old one)
-  void setImpl(void* theImpl);
+  template<class T> inline void setImpl(T* theImpl)
+  {
+    myImpl.reset(theImpl);
+  }
+
+  /// Returns true if the impl is empty
+  GEOMAPI_EXPORT bool empty() const;
 };
 
 #endif