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

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index 49db964fc..93a6de944 100644
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -1,46 +1,80 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAPI_Interface.hxx
-// Created:     23 Apr 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #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 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