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

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index bd9a77ab1..ee2a08379 100644
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -1,38 +1,81 @@
-// File:        GeomAPI_Interface.hxx
-// Created:     23 Apr 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
-#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 impl 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)
-  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 dynamic_cast<T*>(myImpl);}
+  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() {return *(static_cast<T*>(myImpl));}
+  template<class T> inline const T& impl() const
+  {
+    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