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

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

Author: romain
Date: 2011-06-06 13:45:56 +0200 (Mon, 06 Jun 2011)
New Revision: 3046

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/vector/Vector.h
Log:
Vector::init becomes protected instead of private

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2011-06-06 10:16:15 UTC (rev 3045)
+++ pkg/Rcpp/ChangeLog	2011-06-06 11:45:56 UTC (rev 3046)
@@ -1,3 +1,8 @@
+2011-06-06  Romain Francois  <romain at r-enthusiasts.com>
+
+	* inst/include/Rcpp/vector/Vector.h : init becomes protected to fix the bug 
+	reported by Doug Bates on Rcpp-devel. 
+
 2011-05-31  Romain Francois  <romain at r-enthusiasts.com>
 
 	* R/loadRcppModules.R: New argument "direct" in loadRcppModules

Modified: pkg/Rcpp/inst/include/Rcpp/vector/Vector.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/vector/Vector.h	2011-06-06 10:16:15 UTC (rev 3045)
+++ pkg/Rcpp/inst/include/Rcpp/vector/Vector.h	2011-06-06 11:45:56 UTC (rev 3046)
@@ -636,11 +636,11 @@
 		set_sexp(target.asSexp() );
 		return result ;
 	}
-		
+protected:	
 	void init(){
 		internal::r_init_vector<RTYPE>(RObject::m_sexp) ;
 	}
-
+private:
 	virtual void update(){
 		RCPP_DEBUG_2( "Vector<%d>::update( SEXP = <%p> )", RTYPE, RObject::asSexp() ) ;
 		update_vector() ;