resolve conflict in robj.c

gregfu · gregfu · commit b28e59ef7b01 · 2010-09-08T14:29:31.000-07:00
diff --git a/Rakefile.rb b/Rakefile.rb
@@ -14,7 +14,7 @@
   p.summary     = p.paragraphs_of("README.txt",1)[0]
   p.changes     = p.paragraphs_of("History.txt",0..1).join("\n\n")
   
-  p.clean_globs = ["ext/*.o","ext/*.so","ext/Makefile","ext/mkmf.log","**/*~","email.txt","manual.{aux,log,out,toc,pdf}"]
+  p.clean_globs = ["ext/*.o","ext/*.so","ext/*.bundle","ext/Makefile","ext/mkmf.log","**/*~","email.txt","manual.{aux,log,out,toc,pdf}"]
   
   p.rdoc_pattern = /(^lib\/.*\.rb$|^examples\/.*\.rb$|^README|^History|^License)/
   
diff --git a/ext/robj.c b/ext/robj.c
@@ -49,7 +49,7 @@ VALUE RObj_lcall(VALUE self, VALUE args){
   args = rb_check_array_type(args);
 
   // A SEXP with the function to call and the arguments
-  PROTECT(exp = allocVector(LANGSXP, RARRAY_LEN(args)+1));
+  PROTECT(exp = allocVector(LANGSXP, (RARRAY_LEN(args))+1));
   e = exp;
 
   Data_Get_Struct(self, struct SEXPREC, r_obj);
@@ -97,7 +97,7 @@ VALUE RObj_init_lcall(VALUE self, VALUE args){
   args = rb_check_array_type(args);
 
   // A SEXP with the function to call and the arguments
-  PROTECT(exp = allocVector(LANGSXP, RARRAY_LEN(args)+1));
+  PROTECT(exp = allocVector(LANGSXP, (RARRAY_LEN(args))+1));
   e = exp;
 
   Data_Get_Struct(self, struct SEXPREC, r_obj);
