ruby.h: cast for C++

* include/ruby/ruby.h (Data_Make_Struct0, TypedData_Make_Struct0):
  explicit cast from void* is necessary as implicit cast is
  disallowed in C++.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e6801ec1a..152a77a3d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 19 09:43:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (Data_Make_Struct0, TypedData_Make_Struct0):
+	  explicit cast from void* is necessary as implicit cast is
+	  disallowed in C++.
+
 Mon May 18 15:31:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/intern.h (rb_f_notimplement): should not respond to
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 99dcd6acb3..2cbd701c79 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1031,13 +1031,13 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
 #define Data_Wrap_Struct(klass,mark,free,sval)\
     rb_data_object_wrap((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free))
 
-#define Data_Make_Struct0(result, klass, size, mark, free, sval) \
+#define Data_Make_Struct0(result, klass, type, size, mark, free, sval) \
     VALUE result = rb_data_object_zalloc(klass, size, mark, free); \
-    (void)((sval) = DATA_PTR(result));
+    (void)((sval) = (type *)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_Make_Struct0(data_struct_obj, klass, type, sizeof(type), mark, free, sval); \
     data_struct_obj; \
 })
 #else
@@ -1049,13 +1049,13 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
 #define TypedData_Wrap_Struct(klass,data_type,sval)\
   rb_data_typed_object_wrap((klass),(sval),(data_type))
 
-#define TypedData_Make_Struct0(result, klass, size, data_type, sval) \
+#define TypedData_Make_Struct0(result, klass, type, size, data_type, sval) \
     VALUE result = rb_data_typed_object_zalloc(klass, size, data_type); \
-    (void)((sval) = DATA_PTR(result));
+    (void)((sval) = (type *)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); \
+    TypedData_Make_Struct0(data_struct_obj, klass, type, sizeof(type), data_type, sval); \
     data_struct_obj; \
 })
 #else
@@ -1227,14 +1227,14 @@ rb_data_object_get_warning(VALUE obj)
 static inline VALUE
 rb_data_object_make(VALUE klass, RUBY_DATA_FUNC mark_func, RUBY_DATA_FUNC free_func, void **datap, size_t size)
 {
-    Data_Make_Struct0(result, klass, size, mark_func, free_func, *datap);
+    Data_Make_Struct0(result, klass, void, size, mark_func, free_func, *datap);
     return result;
 }
 
 static inline VALUE
 rb_data_typed_object_make(VALUE klass, const rb_data_type_t *type, void **datap, size_t size)
 {
-    TypedData_Make_Struct0(result, klass, size, type, *datap);
+    TypedData_Make_Struct0(result, klass, void, size, type, *datap);
     return result;
 }