diff options
author | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
commit | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (patch) | |
tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /php/ext/google/protobuf/storage.c | |
parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
parent | 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff) | |
download | protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.gz protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.bz2 protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.zip |
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'php/ext/google/protobuf/storage.c')
-rw-r--r-- | php/ext/google/protobuf/storage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/php/ext/google/protobuf/storage.c b/php/ext/google/protobuf/storage.c index e7910c85..a60fbe39 100644 --- a/php/ext/google/protobuf/storage.c +++ b/php/ext/google/protobuf/storage.c @@ -200,7 +200,7 @@ bool native_slot_set_by_array(upb_fieldtype_t type, } #else DEREF(memory, zval*) = value; - ++GC_REFCOUNT(Z_OBJ_P(value)); + GC_ADDREF(Z_OBJ_P(value)); #endif break; } @@ -251,7 +251,7 @@ bool native_slot_set_by_map(upb_fieldtype_t type, const zend_class_entry* klass, } #else DEREF(memory, zend_object*) = Z_OBJ_P(value); - ++GC_REFCOUNT(Z_OBJ_P(value)); + GC_ADDREF(Z_OBJ_P(value)); #endif break; } @@ -428,7 +428,7 @@ void native_slot_get_by_map_value(upb_fieldtype_t type, const void* memory, ZVAL_ZVAL(CACHED_PTR_TO_ZVAL_PTR(cache), value, 1, 0); } #else - ++GC_REFCOUNT(*(zend_object**)memory); + GC_ADDREF(*(zend_object**)memory); ZVAL_OBJ(cache, *(zend_object**)memory); #endif return; |