From cd047b9bb786166485ec21d83d047428f561e6eb Mon Sep 17 00:00:00 2001
From: Martijn Otto <martijn.otto@copernica.com>
Date: Wed, 18 May 2016 11:25:55 +0200
Subject: Store all callables in a map because the hidden pointer trick no
 longer works

---
 zend/callable.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'zend/callable.h')

diff --git a/zend/callable.h b/zend/callable.h
index b2a7047..789d129 100644
--- a/zend/callable.h
+++ b/zend/callable.h
@@ -8,6 +8,11 @@
  *  @copyright 2013 Copernica BV
  */
 
+/**
+ *  Dependencies
+ */
+#include <cstring>
+
 /**
  *  Set up namespace
  */
@@ -25,7 +30,7 @@ public:
      *  @param  arguments   Information about the arguments
      */
     Callable(const char *name, const Arguments &arguments = {}) :
-        _ptr(this, name),
+        _name(name),
         _argc(arguments.size()),
         _argv(new zend_internal_arg_info[_argc + 1])
     {
@@ -49,7 +54,7 @@ public:
      *  @param  that
      */
     Callable(const Callable &that) :
-        _ptr(that._ptr),
+        _name(that._name),
         _return(that._return),
         _required(that._required),
         _argc(that._argc),
@@ -62,7 +67,7 @@ public:
      *  @param  that
      */
     Callable(Callable &&that) :
-        _ptr(std::move(that._ptr)),
+        _name(std::move(that._name)),
         _return(that._return),
         _required(that._required),
         _argc(that._argc),
@@ -100,10 +105,10 @@ public:
 
 protected:
     /**
-     *  Hidden pointer to the name and the function
-     *  @var    HiddenPointer
+     *  Name of the function
+     *  @var    std::string
      */
-    HiddenPointer<Callable> _ptr;
+    std::string _name;
 
     /**
      *  Suggestion for the return type
-- 
cgit v1.2.3