diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-29 10:24:41 +0200 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-29 10:24:41 +0200 |
| commit | 856aaf9880848cab154189a36e33d4d10e3da185 (patch) | |
| tree | 944174ef4046a5af0f27d4d7142aa72b82f8c2f5 /zend | |
| parent | cb6808285bb0e41f90245e568951ee24b6a5faf2 (diff) | |
| parent | 780fde0f4c07920c210cc45ef0c5e4b05f81c76f (diff) | |
Merge pull request #128 from andot/vs2013
Fixed compatibility issue with VS2013
Diffstat (limited to 'zend')
| -rw-r--r-- | zend/includes.h | 1 | ||||
| -rw-r--r-- | zend/objectimpl.h | 12 | ||||
| -rw-r--r-- | zend/super.cpp | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/zend/includes.h b/zend/includes.h index 63b435e..582530b 100644 --- a/zend/includes.h +++ b/zend/includes.h @@ -20,6 +20,7 @@ #include <list> #include <exception> #include <type_traits> +#include <functional> // for debug #include <iostream> diff --git a/zend/objectimpl.h b/zend/objectimpl.h index 7f16320..d72ddbd 100644 --- a/zend/objectimpl.h +++ b/zend/objectimpl.h @@ -98,20 +98,20 @@ public: // when in thread safety mode, the destruct method and free method have // an extra parameter holding thread information - using DestructType = void(zend_object*,unsigned int,void***); - using FreeType = void(zend_object*,void***); + using DestructType = void(*)(zend_object*,unsigned int,void***); + using FreeType = void(*)(zend_object*,void***); #else // not in thread mode: no special parameter for the tsrm_ls variable - using DestructType = void(zend_object*,unsigned int); - using FreeType = void(zend_object*); + using DestructType = void(*)(zend_object*, unsigned int); + using FreeType = void(*)(zend_object*); #endif // store the two destruct methods in temporary vars - DestructType *destructMethod = &ClassImpl::destructObject; - FreeType *freeMethod = &ClassImpl::freeObject; + DestructType destructMethod = &ClassImpl::destructObject; + FreeType freeMethod = &ClassImpl::freeObject; // the destructor and clone handlers are set to NULL. I dont know why, but they do not // seem to be necessary... diff --git a/zend/super.cpp b/zend/super.cpp index c25efeb..a2fa0a9 100644 --- a/zend/super.cpp +++ b/zend/super.cpp @@ -40,7 +40,7 @@ Value Super::operator[](const std::string &key) Value value(PG(http_globals)[_index]); // pass on the call - return value[key]; + return value.get(key); } /** @@ -61,7 +61,7 @@ Value Super::operator[](const char *key) Value value(PG(http_globals)[_index]); // pass on the call - return value[key]; + return value.get(key); } /** |