[Rcpp-commits] r1748 - in pkg/Rcpp: inst/include/classic src

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

Author: romain
Date: 2010-06-25 20:24:46 +0200 (Fri, 25 Jun 2010)
New Revision: 1748

Modified:
   pkg/Rcpp/inst/include/classic/RcppResultSet.h
   pkg/Rcpp/src/RcppResultSet.cpp
Log:
bring back the original add( string, SEXP , bool ) but ignore the bool

Modified: pkg/Rcpp/inst/include/classic/RcppResultSet.h
===================================================================
--- pkg/Rcpp/inst/include/classic/RcppResultSet.h	2010-06-25 18:13:42 UTC (rev 1747)
+++ pkg/Rcpp/inst/include/classic/RcppResultSet.h	2010-06-25 18:24:46 UTC (rev 1748)
@@ -66,6 +66,8 @@
     void add(const std::string& name , const std::vector<std::vector<double> >& object) ;
     void add(const std::string& name , const std::vector<std::vector<int> >& object) ;
     
+    void add(const std::string& name, SEXP, bool ) ;
+    
     SEXP getReturnList();
     SEXP getSEXP();
 

Modified: pkg/Rcpp/src/RcppResultSet.cpp
===================================================================
--- pkg/Rcpp/src/RcppResultSet.cpp	2010-06-25 18:13:42 UTC (rev 1747)
+++ pkg/Rcpp/src/RcppResultSet.cpp	2010-06-25 18:24:46 UTC (rev 1748)
@@ -60,12 +60,16 @@
 
 }
 
+void RcppResultSet::add(const std::string& name , SEXP x, bool){
+	push_back( name, x ) ;
+}
+
 void RcppResultSet::add(const std::string& name , const std::vector<std::vector<double> >& object){
-	return add__matrix__std( name, object ) ;
+	add__matrix__std( name, object ) ;
 }
 
 void RcppResultSet::add(const std::string& name , const std::vector<std::vector<int> >& object){
-	return add__matrix__std( name, object ) ;
+	add__matrix__std( name, object ) ;
 }
     
 void RcppResultSet::add(const std::string& name, double *vec, int len) {