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

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

Author: romain
Date: 2010-08-02 12:46:45 +0200 (Mon, 02 Aug 2010)
New Revision: 1900

Modified:
   pkg/Rcpp/inst/include/Rcpp/XPtr.h
   pkg/Rcpp/src/Module.cpp
Log:
default values for parameters of XPtr

Modified: pkg/Rcpp/inst/include/Rcpp/XPtr.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/XPtr.h	2010-08-02 10:35:27 UTC (rev 1899)
+++ pkg/Rcpp/inst/include/Rcpp/XPtr.h	2010-08-02 10:46:45 UTC (rev 1900)
@@ -59,7 +59,7 @@
      *        so you need to make sure the pointer can be "delete" d
      *        this way (has to be a C++ object)
      */
-    explicit XPtr(T* p, bool set_delete_finalizer, SEXP tag = R_NilValue, SEXP prot = R_NilValue) ;
+    explicit XPtr(T* p, bool set_delete_finalizer, SEXP tag, SEXP prot) ;
 
     XPtr( const XPtr& other ) : RObject( other.asSexp() ) {}
     

Modified: pkg/Rcpp/src/Module.cpp
===================================================================
--- pkg/Rcpp/src/Module.cpp	2010-08-02 10:35:27 UTC (rev 1899)
+++ pkg/Rcpp/src/Module.cpp	2010-08-02 10:46:45 UTC (rev 1900)
@@ -237,7 +237,7 @@
 	CppClass::CppClass( SEXP x) : S4(x){}
 	
 	CppClass::CppClass( Module* p, class_Base* cl ) : S4("C++Class") {
-		XP_Class clxp( cl ) ;
+		XP_Class clxp( cl, false, R_NilValue, R_NilValue ) ;
 		
 		slot( "module"  ) = XP( p, false ) ;
 		slot( "pointer" ) = clxp ;