From: vsr <vsr@opencascade.com>
Date: Thu, 12 Nov 2015 16:30:30 +0000 (+0300)
Subject: gcc 4.9 compatibility: v2 (avoid memory leaks)
X-Git-Tag: V_2.1.0~243^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fvsr%2Fgcc_4_9_compat;p=modules%2Fshaper.git

gcc 4.9 compatibility: v2 (avoid memory leaks)
---

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index de51617ae..27b822012 100644
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -16,6 +16,11 @@
  * \brief General base class for all interfaces in this package
  */
 
+template <typename T>
+void GeomAPI_deleter( void* p ) {
+   delete reinterpret_cast<T*>(p);
+}
+
 class GeomAPI_Interface
 {
  private:
@@ -28,7 +33,7 @@ class GeomAPI_Interface
   /// Constructor by the impl pointer (used for internal needs)
   template<class T> explicit GeomAPI_Interface(T* theImpl)
   {
-    myImpl.reset(reinterpret_cast<char*>(theImpl));
+    myImpl = std::shared_ptr<char>(reinterpret_cast<char*>(theImpl), GeomAPI_deleter<T>);
   }
 
   /// Destructor
@@ -52,7 +57,7 @@ class GeomAPI_Interface
   /// Updates the impl (deletes the old one)
   template<class T> inline void setImpl(T* theImpl)
   {
-    myImpl.reset(reinterpret_cast<char*>(theImpl));
+    myImpl = std::shared_ptr<char>(reinterpret_cast<char*>(theImpl), GeomAPI_deleter<T>);
   }
 
   /// Returns true if the impl is empty