Fixed a rather silly bug where a function no longer overrode a functi…

…on from the parent class. Made this function explicitly override to prevent future problems
CopernicaMarketingSoftware · Feb 18, 2014 · 9c2c6bb · 9c2c6bb
1 parent 1ae81bf
commit 9c2c6bb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/boolmember.h b/src/boolmember.h
@@ -49,7 +49,7 @@ class BoolMember : public MemberInfo
      *  @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
@@ -49,7 +49,7 @@ class DoubleMember : public MemberInfo
      *  @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
@@ -49,7 +49,7 @@ class LongMember : public MemberInfo
      *  @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
@@ -67,15 +67,15 @@ class MemberInfo
      *  @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
      *  @param  entry       Function entry
      *  @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
@@ -43,7 +43,7 @@ class MethodMember : public MemberInfo, public Function
      *  @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
@@ -41,7 +41,7 @@ class NullMember : public MemberInfo
      *  @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
@@ -56,7 +56,7 @@ class StringMember : public MemberInfo
      *  @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());