[前][次][番号順一覧][スレッド一覧]

ruby-changes:43057

From: nobu <ko1@a...>
Date: Mon, 23 May 2016 19:45:18 +0900 (JST)
Subject: [ruby-changes:43057] nobu:r55131 (trunk): revert error attributes

nobu	2016-05-23 19:45:13 +0900 (Mon, 23 May 2016)

  New Revision: 55131

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55131

  Log:
    revert error attributes
    
    * include/ruby/ruby.h (rb_scan_args0): revert error attributes,
      which may not be optimized away in readline extension library.

  Modified files:
    trunk/include/ruby/ruby.h
Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 55130)
+++ include/ruby/ruby.h	(revision 55131)
@@ -2155,13 +2155,8 @@ int ruby_vsnprintf(char *str, size_t n, https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L2155
     __builtin_choose_expr(__builtin_constant_p(fmt), \
         rb_scan_args0(argc,argv,fmt,(sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)),(VALUE*[]){__VA_ARGS__}), \
         rb_scan_args(argc,argvp,fmt,__VA_ARGS__))
-# if GCC_VERSION_SINCE(4, 4, 0)
-void rb_scan_args_bad_format(const char*) __attribute__((error("bad scan arg format")));
-void rb_scan_args_length_mismatch(int, int) __attribute__((error("variable argument length doesn't match")));
-# else
 #   define rb_scan_args_bad_format(fmt) rb_fatal("bad scan arg format: %s", fmt)
 #   define rb_scan_args_length_mismatch(vari, varc) rb_fatal("variable argument length doesn't match: %d %d", vari, varc)
-# endif
 
 ALWAYS_INLINE(static int
 rb_scan_args0(int argc, const VALUE *argv, const char *fmt, int varc, VALUE *vars[]));

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]