diff options
| author | Nobuyoshi Nakada <[email protected]> | 2021-08-08 17:23:56 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2021-08-09 11:21:56 +0900 |
| commit | a14671a6b6ad69bab443df75a3472575e2cc0dbc (patch) | |
| tree | d5e3017f7723aa711dc76b837a45fed1c4799fc1 /include/ruby/internal | |
| parent | f584dc5a11d389a24a504b6066b74d1388f6164b (diff) | |
Suppress warnings in C++2a
* bitwise operation between different enumeration types
('ruby_value_type' and 'ruby_fl_type') is deprecated
[-Wdeprecated-enum-enum-conversion]
* volatile-qualified parameter type 'volatile int' is deprecated
[-Wdeprecated-volatile]
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4720
Diffstat (limited to 'include/ruby/internal')
| -rw-r--r-- | include/ruby/internal/fl_type.h | 2 | ||||
| -rw-r--r-- | include/ruby/internal/interpreter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/ruby/internal/fl_type.h b/include/ruby/internal/fl_type.h index 1d570c4743..1906133f9d 100644 --- a/include/ruby/internal/fl_type.h +++ b/include/ruby/internal/fl_type.h @@ -238,7 +238,7 @@ enum { # pragma deprecated(RUBY_FL_DUPPED) #endif - = RUBY_T_MASK | RUBY_FL_EXIVAR + = (int)RUBY_T_MASK | (int)RUBY_FL_EXIVAR }; #undef RBIMPL_HAVE_ENUM_ATTRIBUTE diff --git a/include/ruby/internal/interpreter.h b/include/ruby/internal/interpreter.h index 29dee60aab..12e7486e15 100644 --- a/include/ruby/internal/interpreter.h +++ b/include/ruby/internal/interpreter.h @@ -64,7 +64,7 @@ void ruby_show_copyright(void); void ruby_init_stack(volatile VALUE*); int ruby_setup(void); -int ruby_cleanup(volatile int); +int ruby_cleanup(int); void ruby_finalize(void); |