From dd5f3a635053aa03417cdab1228e03c94b9c3136 Mon Sep 17 00:00:00 2001
From: Martijn Otto <martijn.otto@copernica.com>
Date: Tue, 17 May 2016 13:47:20 +0200
Subject: Fixed final compilation issues

---
 zend/extensionimpl.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'zend/extensionimpl.h')

diff --git a/zend/extensionimpl.h b/zend/extensionimpl.h
index 3a0fc63..b933624 100644
--- a/zend/extensionimpl.h
+++ b/zend/extensionimpl.h
@@ -2,7 +2,7 @@
  *  ExtensionImpl.h
  *
  *  Extension implementation for the Zend engine.
- * 
+ *
  *  @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
  *  @copyright 2013, 2014 Copernica BV
  */
@@ -23,21 +23,21 @@ protected:
      *  @var zend_module_entry
      */
     zend_module_entry _entry;
-    
+
     /**
      *  Is the object locked? This prevents crashes for 'apache reload'
      *  because we then do not have to re-initialize the entire php engine
      *  @var bool
      */
     bool _locked = false;
-    
+
     /**
      *  The .ini entries
-     *  
-     *  @var zend_ini_entry
+     *
+     *  @var std::unique_ptr<zend_ini_entry_def[]>
      */
-    zend_ini_entry *_ini = nullptr;
-    
+    std::unique_ptr<zend_ini_entry_def[]> _ini = nullptr;
+
 public:
     /**
      *  Constructor
@@ -47,31 +47,31 @@ public:
      *  @param  apiversion  API version number
      */
     ExtensionImpl(Extension *data, const char *name, const char *version, int apiversion);
-    
+
     /**
      *  No copy'ing and no moving
      */
     ExtensionImpl(const ExtensionImpl &extension) = delete;
     ExtensionImpl(ExtensionImpl &&extension) = delete;
-    
+
     /**
      *  Destructor
      */
     virtual ~ExtensionImpl();
-    
+
     /**
      *  The extension name
      *  @return const char *
      */
     const char *name() const;
-    
+
     /**
      *  The extension version
      *  @return const char *
      */
     const char *version() const;
-    
-    /** 
+
+    /**
      *  Is the object locked (true) or is it still possible to add more functions,
      *  classes and other elements to it?
      *  @return bool
@@ -81,17 +81,17 @@ public:
         // return member
         return _locked;
     }
-    
+
     /**
      *  Retrieve the module entry
-     * 
+     *
      *  This is the memory address that should be exported by the get_module()
      *  function.
      *
      *  @return _zend_module_entry
      */
     zend_module_entry *module();
-    
+
     /**
      *  Cast to a module entry
      *  @return _zend_module_entry*
@@ -100,7 +100,7 @@ public:
     {
         return module();
     }
-    
+
 private:
     /**
      *  Initialize the namespace after it was registered
@@ -126,7 +126,7 @@ private:
      *  @return int         0 on success
      */
     static int processStartup(int type, int module_number TSRMLS_DC);
-    
+
     /**
      *  Function that is called when the extension is about to be stopped
      *  @param  type        Module type
@@ -135,7 +135,7 @@ private:
      *  @return int
      */
     static int processShutdown(int type, int module_number TSRMLS_DC);
-    
+
     /**
      *  Function that is called when a request starts
      *  @param  type        Module type
-- 
cgit v1.2.3