added a templated DataFrame ctor

Author: romainfrancois

inst/include/Rcpp/DataFrame.h

@@ -44,6 +44,9 @@ namespace Rcpp{
             set_sexp(other) ;    
         }
 
+        template <typename T>
+        DataFrame_Impl( const T& obj ) ;
+        
         DataFrame_Impl& operator=( DataFrame_Impl& other){
             if( *this != other) set_sexp(other) ;    
         }

inst/include/Rcpp/api/meat/DataFrame.h

@@ -0,0 +1,31 @@
+// Copyright (C) 2013 Romain Francois
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp_api_meat_DataFrame_h
+#define Rcpp_api_meat_DataFrame_h
+
+namespace Rcpp{
+
+     template <template <class> class StoragePolicy>
+     template <class T>
+     DataFrame_Impl<StoragePolicy>::DataFrame_Impl( const T& obj){
+        set_sexp( wrap(obj) ) ;     
+     }
+    
+}
+
+#endif

inst/include/Rcpp/api/meat/meat.h

@@ -30,6 +30,7 @@
 #include <Rcpp/api/meat/NamesProxy.h>
 #include <Rcpp/api/meat/SlotProxy.h>
 
+#include <Rcpp/api/meat/DataFrame.h>
 #include <Rcpp/api/meat/S4.h>
 #include <Rcpp/api/meat/Environment.h>
 

inst/unitTests/RcppTestA/src/rcpp_hello_world.cpp

@@ -12,7 +12,7 @@ SEXP hello_world_ex(){
 	try{
 		throw std::range_error( "boom" ) ;
 	} catch( std::exception& __ex__ ){
-		forward_exception_to_r( __ex__ ) ;	
+	    Rcpp::forward_exception_to_r( __ex__ ) ;	
 	}
 	return R_NilValue ;
 }

src/Module.cpp

@@ -146,7 +146,7 @@ SEXP class__newInstance(SEXP args){
 // relies on being set in .onLoad()
 SEXP rcpp_dummy_pointer = R_NilValue; 
 
-#define CHECK_DUMMY_OBJ(p) if(p == rcpp_dummy_pointer) forward_exception_to_r( Rcpp::not_initialized())
+#define CHECK_DUMMY_OBJ(p) if(p == rcpp_dummy_pointer) Rcpp::forward_exception_to_r( Rcpp::not_initialized())
 
 
 SEXP class__dummyInstance(SEXP args) {

vignettes/Rcpp-introduction.Rnw

@@ -811,7 +811,7 @@ RcppExport SEXP fun( SEXP x ) {
             throw std::range_error("too big");
         return Rcpp::wrap( dx * dx);
     } catch( std::exception& __ex__ ) {
-        forward_exception_to_r( __ex__ );
+        Rcpp::forward_exception_to_r( __ex__ );
     } catch(...) {
         ::Rf_error( "c++ exception (unknown reason)" );
     }