[Rcpp-commits] r2947 - scripts

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

Author: romain
Date: 2011-04-05 11:01:22 +0200 (Tue, 05 Apr 2011)
New Revision: 2947

Modified:
   scripts/DataFrame.R
Log:
tidyning old stuff

Modified: scripts/DataFrame.R
===================================================================
--- scripts/DataFrame.R	2011-04-04 20:03:53 UTC (rev 2946)
+++ scripts/DataFrame.R	2011-04-05 09:01:22 UTC (rev 2947)
@@ -7,18 +7,21 @@
     src <-
     sprintf('
 template <%s>
-static DataFrame create( %s ) throw(not_compatible) {
-    try{
-	SEXP dataFrameSym = ::Rf_install( "data.frame"); // cannot be gc()ed once in symbol table
-	return DataFrame(internal::try_catch(::Rf_lcons(dataFrameSym, pairlist(%s))));
-    } catch( eval_error& __ex__){
-	throw not_compatible("error calling the data.frame function") ;
-    }
+static DataFrame create( %s ) throw(not_compatible){
+	try{
+		return DataFrame( 
+			internal::try_catch( 
+				::Rcpp_lcons( ::Rf_install( "data.frame"), pairlist( %s ) )
+				) ) ;
+	} catch( eval_error& __ex__){
+		throw not_compatible("error calling the data.frame function") ;
+	}
 } ',
             paste( sprintf( "typename T%d", 1:i ), collapse = ", "),
             paste( sprintf( "const T%d& t%d", 1:i, 1:i ), collapse = ", "),
             paste( sprintf( "t%d", 1:i ), collapse = ", ")
             )
+>>>>>>> .r2946
 }