diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-21 06:07:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-21 06:07:22 +0000 |
commit | 49edc2d2ce8a88be46d3c9378ac11794ad108580 (patch) | |
tree | b1cf4b55ba704e39bdd9d04d9119d2ff4549eb38 /include/ruby | |
parent | 61c4a794fe7de6cea4ecedd7d58e866303ae48c8 (diff) | |
download | ruby-49edc2d2ce8a88be46d3c9378ac11794ad108580.tar.gz |
error.c: remove deprecated internal features
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
-rw-r--r-- | include/ruby/backward.h | 11 | ||||
-rw-r--r-- | include/ruby/intern.h | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/include/ruby/backward.h b/include/ruby/backward.h index 0ae9911da8..ebe86b427d 100644 --- a/include/ruby/backward.h +++ b/include/ruby/backward.h @@ -24,6 +24,17 @@ DECLARE_DEPRECATED_FEATURE(2.2, rb_str_associated); DECLARE_DEPRECATED_FEATURE(2.2, rb_clear_cache); DECLARE_DEPRECATED_FEATURE(2.2, rb_frame_pop); +#define DECLARE_DEPRECATED_INTERNAL_FEATURE(func) \ + NORETURN(ERRORFUNC(("deprecated internal function"), DEPRECATED(void func(void)))) + +/* error.c */ +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error); +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_with_enc); +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_append); + +/* struct.c */ +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_struct_ptr); + /* from version.c */ #ifndef RUBY_SHOW_COPYRIGHT_TO_DIE # define RUBY_SHOW_COPYRIGHT_TO_DIE 1 diff --git a/include/ruby/intern.h b/include/ruby/intern.h index d9aecf3446..ac2e539a65 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -247,9 +247,6 @@ PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)), PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3); PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3); NORETURN(void rb_invalid_str(const char*, const char*)); -NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4))); -NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_with_enc(const char*, int, void *, const char*, ...), 4, 5))); -NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2))); NORETURN(void rb_error_frozen(const char*)); NORETURN(void rb_error_frozen_object(VALUE)); CONSTFUNC(void rb_error_untrusted(VALUE)); |