From ffd0820ab317542f8780aac475da590a4bdbc7a8 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 24 Sep 2019 20:59:12 -0700 Subject: Deprecate taint/trust and related methods, and make the methods no-ops This removes the related tests, and puts the related specs behind version guards. This affects all code in lib, including some libraries that may want to support older versions of Ruby. --- include/ruby/intern.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include/ruby') diff --git a/include/ruby/intern.h b/include/ruby/intern.h index e20aa3155d..8ce3ed721c 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -308,10 +308,8 @@ void rb_check_trusted(VALUE); rb_error_frozen_object(frozen_obj); \ } \ } while (0) -#define rb_check_trusted_internal(obj) ((void) 0) #ifdef __GNUC__ #define rb_check_frozen(obj) __extension__({rb_check_frozen_internal(obj);}) -#define rb_check_trusted(obj) __extension__({rb_check_trusted_internal(obj);}) #else static inline void rb_check_frozen_inline(VALUE obj) @@ -322,7 +320,7 @@ rb_check_frozen_inline(VALUE obj) static inline void rb_check_trusted_inline(VALUE obj) { - rb_check_trusted_internal(obj); + rb_check_trusted(obj); } #define rb_check_trusted(obj) rb_check_trusted_inline(obj) #endif -- cgit v1.2.3