summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--error.c4
-rw-r--r--hash.c2
-rw-r--r--internal/error.h6
-rw-r--r--object.c14
-rw-r--r--string.c4
5 files changed, 15 insertions, 15 deletions
diff --git a/error.c b/error.c
index 6e08e64a31..97f8c22102 100644
--- a/error.c
+++ b/error.c
@@ -3313,14 +3313,14 @@ rb_check_frozen(VALUE obj)
void
rb_error_untrusted(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "rb_error_untrusted", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "rb_error_untrusted", NULL);
}
#undef rb_check_trusted
void
rb_check_trusted(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "rb_check_trusted", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "rb_check_trusted", NULL);
}
void
diff --git a/hash.c b/hash.c
index e4c742322b..33b553d466 100644
--- a/hash.c
+++ b/hash.c
@@ -5043,7 +5043,7 @@ env_fetch(int argc, VALUE *argv, VALUE _)
int
rb_env_path_tainted(void)
{
- rb_warn_deprecated_to_remove_at("3.2", "rb_env_path_tainted", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "rb_env_path_tainted", NULL);
return 0;
}
diff --git a/internal/error.h b/internal/error.h
index 6fbe31bb53..360203aefc 100644
--- a/internal/error.h
+++ b/internal/error.h
@@ -88,11 +88,11 @@ void rb_deprecated_method_to_be_removed(const char *);
RBIMPL_ASSERT_NOTHING)
# endif
# define rb_warn_deprecated_to_remove_at(removal, ...) \
- (rb_deprecated_method_to_be_removed(removal), \
- rb_warn_deprecated_to_remove(removal, __VA_ARGS__))
+ (rb_deprecated_method_to_be_removed(#removal), \
+ rb_warn_deprecated_to_remove(#removal, __VA_ARGS__))
#else
# define rb_warn_deprecated_to_remove_at(removal, ...) \
- rb_warn_deprecated_to_remove(removal, __VA_ARGS__)
+ rb_warn_deprecated_to_remove(#removal, __VA_ARGS__)
#endif
VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list);
PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3);
diff --git a/object.c b/object.c
index 91e348a0cd..365c60f9dc 100644
--- a/object.c
+++ b/object.c
@@ -1205,7 +1205,7 @@ rb_obj_dummy1(VALUE _x, VALUE _y)
VALUE
rb_obj_tainted(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "Object#tainted?", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "Object#tainted?", NULL);
return Qfalse;
}
@@ -1219,7 +1219,7 @@ rb_obj_tainted(VALUE obj)
VALUE
rb_obj_taint(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "Object#taint", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "Object#taint", NULL);
return obj;
}
@@ -1234,7 +1234,7 @@ rb_obj_taint(VALUE obj)
VALUE
rb_obj_untaint(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "Object#untaint", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "Object#untaint", NULL);
return obj;
}
@@ -1248,7 +1248,7 @@ rb_obj_untaint(VALUE obj)
VALUE
rb_obj_untrusted(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "Object#untrusted?", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "Object#untrusted?", NULL);
return Qfalse;
}
@@ -1262,7 +1262,7 @@ rb_obj_untrusted(VALUE obj)
VALUE
rb_obj_untrust(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "Object#untrust", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "Object#untrust", NULL);
return obj;
}
@@ -1277,7 +1277,7 @@ rb_obj_untrust(VALUE obj)
VALUE
rb_obj_trust(VALUE obj)
{
- rb_warn_deprecated_to_remove_at("3.2", "Object#trust", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "Object#trust", NULL);
return obj;
}
@@ -1288,7 +1288,7 @@ rb_obj_trust(VALUE obj)
void
rb_obj_infect(VALUE victim, VALUE carrier)
{
- rb_warn_deprecated_to_remove_at("3.2", "rb_obj_infect", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "rb_obj_infect", NULL);
}
/**
diff --git a/string.c b/string.c
index edc3288f0a..827bc8955f 100644
--- a/string.c
+++ b/string.c
@@ -944,14 +944,14 @@ rb_enc_str_new_static(const char *ptr, long len, rb_encoding *enc)
VALUE
rb_tainted_str_new(const char *ptr, long len)
{
- rb_warn_deprecated_to_remove_at("3.2", "rb_tainted_str_new", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "rb_tainted_str_new", NULL);
return rb_str_new(ptr, len);
}
VALUE
rb_tainted_str_new_cstr(const char *ptr)
{
- rb_warn_deprecated_to_remove_at("3.2", "rb_tainted_str_new_cstr", NULL);
+ rb_warn_deprecated_to_remove_at(3.2, "rb_tainted_str_new_cstr", NULL);
return rb_str_new_cstr(ptr);
}