[Rcpp-commits] r4139 - in pkg/Rcpp/inst/include: . Rcpp

[noreply at r-forge.r-project.org]

Author: romain
Date: 2012-12-10 19:54:24 +0100 (Mon, 10 Dec 2012)
New Revision: 4139

Modified:
   pkg/Rcpp/inst/include/Rcpp/lang.h
   pkg/Rcpp/inst/include/RcppCommon.h
Log:
move Rcpp_lcons in lang.h

Modified: pkg/Rcpp/inst/include/Rcpp/lang.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/lang.h	2012-12-10 16:46:35 UTC (rev 4138)
+++ pkg/Rcpp/inst/include/Rcpp/lang.h	2012-12-10 18:54:24 UTC (rev 4139)
@@ -25,8 +25,13 @@
 #define Rcpp_list1 Rf_list1
 #define Rcpp_lang1 Rf_lang1
 
+inline SEXP Rcpp_lcons(SEXP car, SEXP cdr){
+    PROTECT(car) ;
+    car = Rf_lcons( car, cdr ) ; 
+    UNPROTECT(1) ;
+    return car ;
+}
 
-
 inline SEXP Rcpp_list2( SEXP x0, SEXP x1 )
 {
     PROTECT(x0);

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2012-12-10 16:46:35 UTC (rev 4138)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2012-12-10 18:54:24 UTC (rev 4139)
@@ -74,12 +74,6 @@
 #include <Rcpp/sprintf.h>
 
 
-inline SEXP Rcpp_lcons(SEXP car, SEXP cdr){
-    PROTECT(car) ;
-    car = Rf_lcons( car, cdr ) ; 
-    UNPROTECT(1) ;
-    return car ;
-}
 #include <Rcpp/lang.h>
 
 #include <Rcpp/complex.h>