projects
/
awesomized
/
ext-ion
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix warnings
[awesomized/ext-ion]
/
ion_private.h
diff --git
a/ion_private.h
b/ion_private.h
index ba7728c639d075463f4961ad5066bbf7582824e2..2d1c54aff4f11df7b341f2d876fc51fefd208da0 100644
(file)
--- a/
ion_private.h
+++ b/
ion_private.h
@@
-372,7
+372,7
@@
static void *php_ion_obj_ex(void *obj, ptrdiff_t offset) {
return NULL;
}
return NULL;
}
-#define php_ion_decl(type, cname) \
+#define php_ion_decl
_noclone
(type, cname) \
static zend_object_handlers oh_ ## cname; \
static zend_object *create_ion_ ## cname(zend_class_entry *ce) \
{ \
static zend_object_handlers oh_ ## cname; \
static zend_object *create_ion_ ## cname(zend_class_entry *ce) \
{ \
@@
-388,7
+388,9
@@
static void *php_ion_obj_ex(void *obj, ptrdiff_t offset) {
php_ion_ ## type *obj = php_ion_obj(type, std); \
php_ion_ ## type ## _dtor(obj); \
zend_object_std_dtor(std); \
php_ion_ ## type *obj = php_ion_obj(type, std); \
php_ion_ ## type ## _dtor(obj); \
zend_object_std_dtor(std); \
- } \
+ }
+#define php_ion_decl(type, cname) \
+ php_ion_decl_noclone(type, cname) \
static zend_object *clone_ion_ ## cname(zend_object *std) \
{ \
php_ion_ ## type *old_obj = php_ion_obj(type, std), \
static zend_object *clone_ion_ ## cname(zend_object *std) \
{ \
php_ion_ ## type *old_obj = php_ion_obj(type, std), \
@@
-1304,7
+1306,7
@@
static void php_ion_reader_dtor(php_ion_reader *obj)
}
#define php_ion_reader_copy(n,o)
}
#define php_ion_reader_copy(n,o)
-php_ion_decl(reader, Reader_Reader);
+php_ion_decl
_noclone
(reader, Reader_Reader);
#define clone_ion_Reader_Reader NULL
typedef struct php_ion_writer_options {
#define clone_ion_Reader_Reader NULL
typedef struct php_ion_writer_options {
@@
-1327,13
+1329,6
@@
static void php_ion_writer_options_dtor(php_ion_writer_options *obj)
php_ion_decl(writer_options, Writer_Options);
php_ion_decl(writer_options, Writer_Options);
-static zend_object *php_ion_writer_options_new(void)
-{
- zend_object *obj = create_ion_Writer_Options(NULL);
- zend_call_known_instance_method_with_0_params(obj->ce->constructor, obj, NULL);
- return obj;
-}
-
typedef struct php_ion_writer {
ION_WRITER *writer;
enum {
typedef struct php_ion_writer {
ION_WRITER *writer;
enum {
@@
-1524,7
+1519,7
@@
static void php_ion_writer_dtor(php_ion_writer *obj)
}
#define php_ion_writer_copy(o,n)
}
#define php_ion_writer_copy(o,n)
-php_ion_decl(writer, Writer_Writer);
+php_ion_decl
_noclone
(writer, Writer_Writer);
#define clone_ion_Writer_Writer NULL
static bool can_serialize_fast(php_ion_serializer *ser)
#define clone_ion_Writer_Writer NULL
static bool can_serialize_fast(php_ion_serializer *ser)