diff options
| author | Marcus Boerger <helly@php.net> | 2003-08-29 23:27:22 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-08-29 23:27:22 +0000 |
| commit | 047a574e6c930ff4c451031843687d89305ce8c4 (patch) | |
| tree | 56b270bf247b13c53e465acf65ada6b4d0512b0a /Zend/zend_API.h | |
| parent | 50040c8ae9bdc7e015f95872863887191a6e7ddb (diff) | |
| download | php-git-047a574e6c930ff4c451031843687d89305ce8c4.tar.gz | |
- Add zend_merge_properties() which is designed to serve *_fetch_object().
- Explain drawbacks of object_and_properties_init and zend_merge_properties.
#
# I guess we can live with the purity problem of potentially calling __set()
# of an object which wasn't already ctored.
#
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index ad500c1532..4bbc3c2e09 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -203,6 +203,8 @@ ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC TSRMLS_DC); ZEND_API int _object_init_ex(zval *arg, zend_class_entry *ce ZEND_FILE_LINE_DC TSRMLS_DC); ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *ce, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC); +ZEND_API void zend_merge_properties(zval *obj, HashTable *properties, int destroy_ht TSRMLS_DC); + /* no longer supported */ ZEND_API int add_assoc_function(zval *arg, char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS)); |