diff --git a/bindings/ruby/src/drr.cxx b/bindings/ruby/src/drr.cxx index 8102e194e3e815e27f4f683cf892d322ed48b762..d99995fa751ea0d41a70755ce3d7c47be56479c8 100644 --- a/bindings/ruby/src/drr.cxx +++ b/bindings/ruby/src/drr.cxx @@ -163,36 +163,6 @@ VALUE rr_seqcollection_new (TSeqCollection *sc) return arr; } -void * rr_parse_void (VALUE o) -{ - VALUE *i; - - switch (TYPE(o)) - { - case T_STRING: - return (void *) RSTRING_PTR(o); - case T_FLOAT: - return (void *) &RFLOAT_VALUE(o); - case T_FIXNUM: - /* FIXME: Memory leak until I find the correct way. Until - * then please use integers in TTrees with care. --elathan - */ - i = (VALUE*) malloc (sizeof(VALUE)); - *i = (int) (o>>1); - return (void *) i; - case T_OBJECT: - RRGRAB(o, void *, res); - return res; - default: - VALUE tmp = CLASS_OF(o); - rb_fatal ("Failed convertion of %d to void *.\n", - StringValuePtr(tmp)); - break; - } - - return (void *) NULL; -} - VALUE rr_bool (Bool_t q) { VALUE res = Qnil; diff --git a/bindings/ruby/src/rrcommon.h b/bindings/ruby/src/rrcommon.h index b85e9ad5f6cec08347679be260ebac77cb95fd48..baa6135e600bac0335daaef2336d63f8887afb10 100644 --- a/bindings/ruby/src/rrcommon.h +++ b/bindings/ruby/src/rrcommon.h @@ -97,8 +97,6 @@ VALUE rr_arrayf_new (const TArrayF *a); VALUE rr_arrayd_new (const TArrayD *a); VALUE rr_seqcollection_new (TSeqCollection *sc); -void * rr_parse_void (VALUE o); - /* mod convertions */ void rr_tattfill_conv(void **ptr, VALUE klass); void rr_tattline_conv(void **ptr, VALUE klass); diff --git a/configure b/configure index f5236d5d0fa2c4b87e418402f374ab5f6760dc8a..5996cd57bd142758f493e915c98554e5a159bec5 100755 --- a/configure +++ b/configure @@ -6946,9 +6946,10 @@ rm -f RConfigOptions.tmp if test ! "x$enable_ruby" = "xno"; then echo "" >> RConfigOptions-out.tmp - ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]' | \ - sed 's/^\([0-9]\)\.\([0-9]\).*$/#define R__RUBY_MAJOR \1@#define R__RUBY_MINOR \2/' | \ - tr '@' '\n' >> RConfigOptions-out.tmp + RUBY_MAJOR=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["MAJOR"]'` + RUBY_MINOR=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["MINOR"]'` + echo "#define R__RUBY_MAJOR $RUBY_MAJOR" >> RConfigOptions-out.tmp + echo "#define R__RUBY_MINOR $RUBY_MINOR" >> RConfigOptions-out.tmp fi # only update $CONFIGOPTOUT when different