diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2017-03-21 10:18:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-21 10:18:49 -0700 |
commit | 1387a6795c743fa41a21e8e1501953cb018be760 (patch) | |
tree | a08e1b80aaf61c15c41cd4a66b884d7a8922e2da /php | |
parent | ffa932bf10d958fc3dff3ac9153f1b4ef55d6024 (diff) | |
download | protobuf-1387a6795c743fa41a21e8e1501953cb018be760.tar.gz protobuf-1387a6795c743fa41a21e8e1501953cb018be760.tar.bz2 protobuf-1387a6795c743fa41a21e8e1501953cb018be760.zip |
Update commit number in Docker to update composer dependency (#2869)
Diffstat (limited to 'php')
-rw-r--r-- | php/ext/google/protobuf/array.c | 2 | ||||
-rw-r--r-- | php/ext/google/protobuf/map.c | 2 | ||||
-rw-r--r-- | php/ext/google/protobuf/type_check.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/php/ext/google/protobuf/array.c b/php/ext/google/protobuf/array.c index ab2eaf90..2186ab1f 100644 --- a/php/ext/google/protobuf/array.c +++ b/php/ext/google/protobuf/array.c @@ -230,7 +230,7 @@ void repeated_field_create_with_field(zend_class_entry *ce, zval **repeated_field TSRMLS_DC) { upb_fieldtype_t type = upb_fielddef_type(field); const zend_class_entry *msg_ce = field_type_class(field TSRMLS_CC); - repeated_field_create_with_type(ce, type, msg_ce, repeated_field); + repeated_field_create_with_type(ce, type, msg_ce, repeated_field TSRMLS_CC); } void repeated_field_create_with_type(zend_class_entry *ce, diff --git a/php/ext/google/protobuf/map.c b/php/ext/google/protobuf/map.c index 4a3829d6..fae152e3 100644 --- a/php/ext/google/protobuf/map.c +++ b/php/ext/google/protobuf/map.c @@ -247,7 +247,7 @@ void map_field_create_with_field(zend_class_entry *ce, const upb_fielddef *field const upb_fielddef *value_field = map_field_value(field); map_field_create_with_type( ce, upb_fielddef_type(key_field), upb_fielddef_type(value_field), - field_type_class(value_field TSRMLS_CC), map_field); + field_type_class(value_field TSRMLS_CC), map_field TSRMLS_CC); } void map_field_create_with_type(zend_class_entry *ce, upb_fieldtype_t key_type, diff --git a/php/ext/google/protobuf/type_check.c b/php/ext/google/protobuf/type_check.c index 718682ac..fe9b18f0 100644 --- a/php/ext/google/protobuf/type_check.c +++ b/php/ext/google/protobuf/type_check.c @@ -439,7 +439,8 @@ PHP_METHOD(Util, checkRepeatedField) { zend_hash_get_current_data_ex(table, (void**)&memory, &pointer) == SUCCESS; zend_hash_move_forward_ex(table, &pointer)) { - repeated_field_handlers->write_dimension(repeated_field, NULL, *(zval**)memory); + repeated_field_handlers->write_dimension(repeated_field, NULL, + *(zval**)memory TSRMLS_CC); } Z_DELREF_P(repeated_field); @@ -497,7 +498,8 @@ PHP_METHOD(Util, checkMapField) { SUCCESS; zend_hash_move_forward_ex(table, &pointer)) { zend_hash_get_current_key_zval_ex(table, &key, &pointer); - map_field_handlers->write_dimension(map_field, &key, *(zval**)value); + map_field_handlers->write_dimension(map_field, &key, + *(zval**)value TSRMLS_CC); } Z_DELREF_P(map_field); |