kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ruby.h: suppress warnings

Browse source 
* include/ruby/ruby.h (Data_Make_Struct, TypedData_Make_Struct):
  make statement-expression to get rid of strict-aliasing warnings
  by old GCC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-05-11 00:41:11 +00:00
parent a1ee941e02
commit 3f29f5205c
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
include/ruby/ruby.h
View file

@ -1031,16 +1031,38 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
#define Data_Wrap_Struct(klass,mark,free,sval)\ #define Data_Wrap_Struct(klass,mark,free,sval)\
rb_data_object_alloc((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free)) rb_data_object_alloc((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free))
#define Data_Make_Struct0(result, klass, size, mark, free, sval) \
VALUE result = rb_data_object_zalloc(klass, size, mark, free); \
(void)((sval) = DATA_PTR(result));
#ifdef __GNUC__
#define Data_Make_Struct(klass,type,mark,free,sval) ({\
Data_Make_Struct0(data_struct_obj, klass, sizeof(type), mark, free, sval); \
data_struct_obj; \
})
#else
#define Data_Make_Struct(klass,type,mark,free,sval) (\ #define Data_Make_Struct(klass,type,mark,free,sval) (\
rb_data_struct_make((klass),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free),(void **)&(sval),sizeof(type)) \ rb_data_struct_make((klass),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free),(void **)&(sval),sizeof(type)) \
) )
#endif
#define TypedData_Wrap_Struct(klass,data_type,sval)\ #define TypedData_Wrap_Struct(klass,data_type,sval)\
rb_data_typed_object_alloc((klass),(sval),(data_type)) rb_data_typed_object_alloc((klass),(sval),(data_type))
#define TypedData_Make_Struct0(result, klass, size, data_type, sval) \
VALUE result = rb_data_typed_object_zalloc(klass, size, data_type); \
(void)((sval) = DATA_PTR(result));
#ifdef __GNUC__
#define TypedData_Make_Struct(klass, type, data_type, sval) ({\
TypedData_Make_Struct0(data_struct_obj, klass, sizeof(type), data_type, sval); \
data_struct_obj; \
})
#else
#define TypedData_Make_Struct(klass, type, data_type, sval) (\ #define TypedData_Make_Struct(klass, type, data_type, sval) (\
rb_data_typed_struct_make((klass),(data_type),(void **)&(sval),sizeof(type)) \ rb_data_typed_struct_make((klass),(data_type),(void **)&(sval),sizeof(type)) \
) )
#endif
#define Data_Get_Struct(obj,type,sval) \ #define Data_Get_Struct(obj,type,sval) \
((sval) = (type*)rb_data_object_get(obj)) ((sval) = (type*)rb_data_object_get(obj))
@ -1205,17 +1227,15 @@ rb_data_object_get_warning(VALUE obj)
static inline VALUE static inline VALUE
rb_data_struct_make(VALUE klass, RUBY_DATA_FUNC mark_func, RUBY_DATA_FUNC free_func, void **datap, size_t size) rb_data_struct_make(VALUE klass, RUBY_DATA_FUNC mark_func, RUBY_DATA_FUNC free_func, void **datap, size_t size)
{ {
VALUE obj = rb_data_object_zalloc(klass, size, mark_func, free_func); Data_Make_Struct0(result, klass, size, mark_func, free_func, *datap);
*datap = DATA_PTR(obj); return result;
return obj;
} }
static inline VALUE static inline VALUE
rb_data_typed_struct_make(VALUE klass, const rb_data_type_t *type, void **datap, size_t size) rb_data_typed_struct_make(VALUE klass, const rb_data_type_t *type, void **datap, size_t size)
{ {
VALUE obj = rb_data_typed_object_zalloc(klass, size, type); TypedData_Make_Struct0(result, klass, size, type, *datap);
*datap = DATA_PTR(obj); return result;
return obj;
} }
#define rb_data_object_alloc_0 rb_data_object_alloc #define rb_data_object_alloc_0 rb_data_object_alloc