diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 00:54:46 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 00:54:46 +0000 |
commit | f2e248c423746653b18c1edef2afd2d4ca953e06 (patch) | |
tree | 7b6438e6ad41d1f5df53e876d759e82ae2ad1a5a | |
parent | 26a195056906900a98f74841ad5ac7b9ad4475f9 (diff) | |
download | ruby-f2e248c423746653b18c1edef2afd2d4ca953e06.tar.gz |
ruby.h: cast for C++
* include/ruby/ruby.h (Data_Make_Struct0): needs function pointer
casts to fix function overloading in C++.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/ruby/ruby.h | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue May 19 09:54:44 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/ruby.h (Data_Make_Struct0): needs function pointer + casts to fix function overloading in C++. + Tue May 19 09:43:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/ruby.h (Data_Make_Struct0, TypedData_Make_Struct0): diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 2cbd701c79..4433dbcbbd 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1032,7 +1032,9 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *); rb_data_object_wrap((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free)) #define Data_Make_Struct0(result, klass, type, size, mark, free, sval) \ - VALUE result = rb_data_object_zalloc(klass, size, mark, free); \ + VALUE result = rb_data_object_zalloc((klass), (size), \ + (RUBY_DATA_FUNC)(mark), \ + (RUBY_DATA_FUNC)(free)); \ (void)((sval) = (type *)DATA_PTR(result)); #ifdef __GNUC__ |