Skip to content

Commit fb0b0c1

Browse files
authored
Merge pull request #322 from Jan-E/remove_ZEND_ACC_CLONE
remove ZEND_ACC_CLONE
2 parents 4af1cca + 53533cd commit fb0b0c1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

v8js_class.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ static PHP_METHOD(V8Js, __construct)
537537
continue;
538538
}
539539

540-
if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
540+
if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) {
541541
/* no __construct, __destruct(), or __clone() functions */
542542
continue;
543543
}

v8js_object_export.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static void v8js_named_property_enumerator(const v8::PropertyCallbackInfo<v8::Ar
336336
/* Allow only public methods */
337337
continue;
338338
}
339-
if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
339+
if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) {
340340
/* no __construct, __destruct(), or __clone() functions */
341341
continue;
342342
}
@@ -539,7 +539,7 @@ static void v8js_fake_call_impl(const v8::FunctionCallbackInfo<v8::Value>& info)
539539

540540
if (method_ptr == NULL ||
541541
(method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) == 0 ||
542-
(method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
542+
(method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) {
543543
error_len = spprintf(&error, 0,
544544
"%s::__call to %s method %s", ce->name,
545545
(method_ptr == NULL) ? "undefined" : "non-public", method_name);
@@ -619,7 +619,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
619619
(method_ptr = reinterpret_cast<zend_function *>
620620
(zend_hash_find_ptr(&ce->function_table, method_name))) &&
621621
((method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) != 0) && /* Allow only public methods */
622-
((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) == 0) /* no __construct, __destruct(), or __clone() functions */
622+
((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) == 0) /* no __construct, __destruct(), or __clone() functions */
623623
) || (method_ptr=NULL, is_magic_call)
624624
) {
625625
if (callback_type == V8JS_PROP_GETTER) {

0 commit comments

Comments
 (0)