summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Otto <martijn.otto@copernica.com>2014-02-18 13:43:03 +0100
committerMartijn Otto <martijn.otto@copernica.com>2014-02-18 13:43:03 +0100
commit9c2c6bbb77974344d3f1e344716391e4e5aa5345 (patch)
tree13eb531abc83916b679e81d0f0f8b84f4b6d599f
parent1ae81bf877a40929c986c1b7961c2f70918fbb7e (diff)
Fixed a rather silly bug where a function no longer overrode a function from the parent class. Made this function explicitly override to prevent future problems
-rw-r--r--src/boolmember.h2
-rw-r--r--src/doublemember.h2
-rw-r--r--src/longmember.h2
-rw-r--r--src/memberinfo.h4
-rw-r--r--src/methodmember.h2
-rw-r--r--src/nullmember.h2
-rw-r--r--src/stringmember.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/boolmember.h b/src/boolmember.h
index 6a241a0..981a711 100644
--- a/src/boolmember.h
+++ b/src/boolmember.h
@@ -49,7 +49,7 @@ public:
* @param size Size of the name
* @param flags Additional flags
*/
- virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
+ virtual void declare(struct _zend_class_entry *entry, const char *name, int size, MemberModifier flags) override
{
#if PHP_VERSION_ID >= 50400
if (flags == constMember) zend_declare_class_constant_bool(entry, name, size, _value);
diff --git a/src/doublemember.h b/src/doublemember.h
index 2d5e89d..c541854 100644
--- a/src/doublemember.h
+++ b/src/doublemember.h
@@ -49,7 +49,7 @@ public:
* @param size Size of the name
* @param flags Additional flags
*/
- virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
+ virtual void declare(struct _zend_class_entry *entry, const char *name, int size, MemberModifier flags) override
{
#if PHP_VERSION_ID >= 50400
if (flags == constMember) zend_declare_class_constant_double(entry, name, size, _value);
diff --git a/src/longmember.h b/src/longmember.h
index 2dafe5b..8e89292 100644
--- a/src/longmember.h
+++ b/src/longmember.h
@@ -49,7 +49,7 @@ public:
* @param size Size of the name
* @param flags Additional flags
*/
- virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
+ virtual void declare(struct _zend_class_entry *entry, const char *name, int size, MemberModifier flags) override
{
#if PHP_VERSION_ID >= 50400
if (flags == constMember) zend_declare_class_constant_long(entry, name, size, _value);
diff --git a/src/memberinfo.h b/src/memberinfo.h
index 935ad23..fed7976 100644
--- a/src/memberinfo.h
+++ b/src/memberinfo.h
@@ -67,7 +67,7 @@ public:
* @param size Size of the name
* @param flags Additional flags
*/
- virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) {};
+ virtual void declare(struct _zend_class_entry *entry, const char *name, int size, MemberModifier flags) {};
/**
* Fill a function entry object
@@ -75,7 +75,7 @@ public:
* @param classname Name of the class
* @param flags Is this a public method?
*/
- virtual void fill(struct _zend_function_entry *entry, const char *classname, int flags) {};
+ virtual void fill(struct _zend_function_entry *entry, const char *classname, MemberModifier flags) {};
};
/**
diff --git a/src/methodmember.h b/src/methodmember.h
index 4f2d4e5..709aec9 100644
--- a/src/methodmember.h
+++ b/src/methodmember.h
@@ -43,7 +43,7 @@ public:
* @param classname Name of the class
* @param method Is this a public entry
*/
- virtual void fill(struct _zend_function_entry *entry, const char *classname, MemberModifier flags)
+ virtual void fill(struct _zend_function_entry *entry, const char *classname, MemberModifier flags) override
{
// call function object
Function::fill(entry, classname, flags);
diff --git a/src/nullmember.h b/src/nullmember.h
index 9b8584f..252704c 100644
--- a/src/nullmember.h
+++ b/src/nullmember.h
@@ -41,7 +41,7 @@ public:
* @param size Size of the name
* @param flags Additional flags
*/
- virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
+ virtual void declare(struct _zend_class_entry *entry, const char *name, int size, MemberModifier flags) override
{
#if PHP_VERSION_ID >= 50400
if (flags == constMember) zend_declare_class_constant_null(entry, name, size);
diff --git a/src/stringmember.h b/src/stringmember.h
index bdc53c7..c5e2a45 100644
--- a/src/stringmember.h
+++ b/src/stringmember.h
@@ -56,7 +56,7 @@ public:
* @param size Size of the name
* @param flags Additional flags
*/
- virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
+ virtual void declare(struct _zend_class_entry *entry, const char *name, int size, MemberModifier flags) override
{
#if PHP_VERSION_ID >= 50400
if (flags == constMember) zend_declare_class_constant_stringl(entry, name, size, _value.c_str(), _value.size());