diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2013-12-06 07:42:36 -0800 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2013-12-06 07:42:36 -0800 |
commit | c91dc2292f4fd49a3103691cb70fee8336c6aa6c (patch) | |
tree | 578d41f25a0ce7b37ab3b7c9d2aa1992ca91b0c0 /include/base.h | |
parent | 3750e24683f3a1d0b643e9808d9619db40d31cc4 (diff) |
Global variables are now accessible via Php::globals["varname"]
Diffstat (limited to 'include/base.h')
-rw-r--r-- | include/base.h | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/include/base.h b/include/base.h index 1dc131e..56189e2 100644 --- a/include/base.h +++ b/include/base.h @@ -28,46 +28,21 @@ public: /** * The pseudo constructor that is called from PHP after the object is constructed - * @param environment * @param parameters */ - virtual void __construct(Environment &environment, const Parameters ¶meters) + virtual void __construct(const Parameters ¶meters) { // call all other possible implementations - __construct(environment); - __construct(parameters); __construct(); } /** * The pseudo constructor that is called from PHP after the object is constructed - * @param environment - */ - virtual void __construct(Environment &environment) {} - - /** - * The pseudo constructor that is called from PHP after the object is constructed - * @param parameters - */ - virtual void __construct(const Parameters ¶meters) {} - - /** - * The pseudo constructor that is called from PHP after the object is constructed */ virtual void __construct() {} /** * The pseudo destructor that is called from PHP right before the object is destructed - * @param environment - */ - virtual void __destruct(Environment &environment) - { - // call the other implementation - __destruct(); - } - - /** - * The pseudo destructor that is called from PHP right before the object is destructed */ virtual void __destruct() {} @@ -100,12 +75,8 @@ private: */ typedef void (Base::*method_callback_0)(); typedef void (Base::*method_callback_1)(Parameters &); -typedef void (Base::*method_callback_2)(Environment &); -typedef void (Base::*method_callback_3)(Environment &, Parameters &); -typedef Value (Base::*method_callback_4)(); -typedef Value (Base::*method_callback_5)(Parameters &); -typedef Value (Base::*method_callback_6)(Environment &); -typedef Value (Base::*method_callback_7)(Environment &, Parameters &); +typedef Value (Base::*method_callback_2)(); +typedef Value (Base::*method_callback_3)(Parameters &); /** * End of namespace |