protecting against R's inconsitencies

romainfrancois · romainfrancois · commit e38478a8b195 · 2014-04-02T08:29:31.000+02:00
diff --git a/inst/include/Rcpp/DataFrame.h b/inst/include/Rcpp/DataFrame.h
@@ -24,7 +24,7 @@ namespace Rcpp{
             while( att != R_NilValue ){
                 if( TAG(att) == R_RowNamesSymbol ){
                     SEXP rn = CAR(att) ; 
-                    if( TYPEOF(rn) == INTSXP && LENGTH(rn) == 2 && INTEGER(rn)[0] == NA_INTEGER ) return -INTEGER(rn)[1] ;
+                    if( TYPEOF(rn) == INTSXP && LENGTH(rn) == 2 && INTEGER(rn)[0] == NA_INTEGER ) return abs(INTEGER(rn)[1]) ;
                     return LENGTH(rn) ;        
                 }
                 att = CDR(att) ;    

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace Rcpp{`
`24`	`24`	`while( att != R_NilValue ){`
`25`	`25`	`if( TAG(att) == R_RowNamesSymbol ){`
`26`	`26`	`SEXP rn = CAR(att) ;`
`27`		`- if( TYPEOF(rn) == INTSXP && LENGTH(rn) == 2 && INTEGER(rn)[0] == NA_INTEGER ) return -INTEGER(rn)[1] ;`
	`27`	`+ if( TYPEOF(rn) == INTSXP && LENGTH(rn) == 2 && INTEGER(rn)[0] == NA_INTEGER ) return abs(INTEGER(rn)[1]) ;`
`28`	`28`	`return LENGTH(rn) ;`
`29`	`29`	`}`
`30`	`30`	`att = CDR(att) ;`