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

Revert "include/ruby/3/core/rtypeddata.h: Use 0 instead of NULL for C++ compiler"

Browse source 
This reverts commit d2bb2e066b.

It didn't work:

https://rubyci.org/logs/rubyci.s3.amazonaws.com/icc-x64/ruby-master/log/20200409T050004Z.log.html.gz#end
```
In file included from ../../.././include/ruby/3/core.h(32),
                 from ../../.././include/ruby/ruby.h(28),
                 from ../../.././include/ruby.h(33),
                 from init.c(1):
../../.././include/ruby/3/core/rtypeddata.h(164): warning #967: conversion from "int" to "const struct rb_data_type_struct *"; sizes do not match
          RUBY3_UNREACHABLE_RETURN(0);
```
This commit is contained in:
Yusuke Endoh 2020-04-09 14:24:23 +09:00
parent fd0222caed
commit b965e7e05e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ruby/3/core/rtypeddata.h
View file

@ -160,8 +160,8 @@ RTYPEDDATA_TYPE(VALUE obj)
#if ! RUBY_NDEBUG
if (RB_UNLIKELY(! RTYPEDDATA_P(obj))) {
rb_unexpected_type(obj, RUBY_T_DATA);
# if ! defined(__sun)
RUBY3_UNREACHABLE_RETURN(0);
# if ! defined(__sun) && ! RUBY3_COMPILER_IS(Intel)
RUBY3_UNREACHABLE_RETURN(NULL);
# endif
}
#endif