Permalink
Browse files

resolve conflict in robj.c

  • Loading branch information...
gregfu committed Sep 8, 2010
2 parents 91f9f2b + 4ba14db commit b28e59ef7b01b59cc1ca2455c8674d247c9c98ef
Showing with 3 additions and 3 deletions.
  1. +1 −1 Rakefile.rb
  2. +2 −2 ext/robj.c
View
@@ -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)/
View
@@ -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);

0 comments on commit b28e59e

Please sign in to comment.