diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2020-04-09 14:24:23 +0900 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2020-04-09 14:24:23 +0900 |
| commit | b965e7e05e4307e3c4b396673e63dbc493ef2f20 (patch) | |
| tree | bedc53aa0d56a50ca43143f7fc152e6ad4837f1c | |
| parent | fd0222caedf1be56faa004656bbf145522abbe68 (diff) | |
Revert "include/ruby/3/core/rtypeddata.h: Use 0 instead of NULL for C++ compiler"
This reverts commit d2bb2e066b5a914283dd3ea473fc1762183af013.
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);
```
| -rw-r--r-- | include/ruby/3/core/rtypeddata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ruby/3/core/rtypeddata.h b/include/ruby/3/core/rtypeddata.h index 9ba1f363c6..21b08570fe 100644 --- a/include/ruby/3/core/rtypeddata.h +++ b/include/ruby/3/core/rtypeddata.h @@ -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 |