[Rcpp-commits] r794 - in pkg/Rcpp: . inst src/Rcpp

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

Author: romain
Date: 2010-02-28 14:57:28 +0100 (Sun, 28 Feb 2010)
New Revision: 794

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/ChangeLog
   pkg/Rcpp/src/Rcpp/Vector.h
Log:
s/VBase/VectorBase/g

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-02-28 13:52:46 UTC (rev 793)
+++ pkg/Rcpp/DESCRIPTION	2010-02-28 13:57:28 UTC (rev 794)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Rcpp R/C++ interface package
-Version: 0.7.7.10
+Version: 0.7.7.11
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek and David Reiss; based on code written during 

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-02-28 13:52:46 UTC (rev 793)
+++ pkg/Rcpp/inst/ChangeLog	2010-02-28 13:57:28 UTC (rev 794)
@@ -1,4 +1,4 @@
-2010-02-24  Romain Francois <romain at r-enthusiasts.com>
+2010-02-28  Romain Francois <romain at r-enthusiasts.com>
 
     * src/Rcpp/Vector.h : more generic code for vectors. All vector 
     types are now generated from the template Rcpp::Vector<int RTYPE>

Modified: pkg/Rcpp/src/Rcpp/Vector.h
===================================================================
--- pkg/Rcpp/src/Rcpp/Vector.h	2010-02-28 13:52:46 UTC (rev 793)
+++ pkg/Rcpp/src/Rcpp/Vector.h	2010-02-28 13:57:28 UTC (rev 794)
@@ -378,12 +378,12 @@
 } // traits 
 
 template <typename VECTOR>
-class VBase : public RObject{
+class VectorBase : public RObject{
 public:
-	VBase() : RObject(){}
-	VBase(SEXP x) : RObject(x){}
-	VBase(const VBase& v) : RObject( v.asSexp() ){}
-	VBase& operator=(const VBase& v) {
+	VectorBase() : RObject(){}
+	VectorBase(SEXP x) : RObject(x){}
+	VectorBase(const VectorBase& v) : RObject( v.asSexp() ){}
+	VectorBase& operator=(const VectorBase& v) {
 		setSEXP( v.asSexp() ) ;
 		return *this ;
 	}
@@ -396,9 +396,9 @@
 } ;
 
 template <int RTYPE>
-class Vector : public VBase< Vector<RTYPE> >, public internal::eval_methods< Vector<RTYPE> >{
+class Vector : public VectorBase< Vector<RTYPE> >, public internal::eval_methods< Vector<RTYPE> >{
 public:
-	typedef VBase<Vector> Base ;
+	typedef VectorBase<Vector> Base ;
 	typedef typename traits::r_vector_proxy<RTYPE>::type Proxy ;
 	typedef typename traits::r_vector_name_proxy<RTYPE>::type NameProxy ;
 	typedef typename traits::r_vector_proxy<RTYPE>::type value_type ;