[Rcpp-commits] r2831 - in pkg/Rcpp/inst/include/Rcpp: . sugar/block

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

Author: romain
Date: 2011-01-04 20:04:41 +0100 (Tue, 04 Jan 2011)
New Revision: 2831

Modified:
   pkg/Rcpp/inst/include/Rcpp/Extractor.h
   pkg/Rcpp/inst/include/Rcpp/sugar/block/Vectorized_Math.h
Log:
trivial fix, I'm not dealing with rev 2830 stuff

Modified: pkg/Rcpp/inst/include/Rcpp/Extractor.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Extractor.h	2011-01-04 18:54:23 UTC (rev 2830)
+++ pkg/Rcpp/inst/include/Rcpp/Extractor.h	2011-01-04 19:04:41 UTC (rev 2831)
@@ -39,7 +39,6 @@
     template <> 
     struct Extractor<INTSXP, true, Rcpp::Vector<INTSXP> >{
         typedef Rcpp::Fast< Rcpp::Vector<INTSXP> > type ;
-    
     } ;
     
     template <> 

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/block/Vectorized_Math.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/block/Vectorized_Math.h	2011-01-04 18:54:23 UTC (rev 2830)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/block/Vectorized_Math.h	2011-01-04 19:04:41 UTC (rev 2831)
@@ -42,7 +42,7 @@
 } ;
 
 template <double Func(double), bool NA, typename VEC>
-class Vectorized_INTSXP : public VectorBase<REALSXP, NA, Vectorized<Func,NA,VEC> >{
+class Vectorized_INTSXP : public VectorBase<REALSXP, NA, Vectorized_INTSXP<Func,NA,VEC> >{
 public:
     typedef typename Rcpp::VectorBase<INTSXP,NA,VEC> VEC_TYPE ;
 	typedef typename Rcpp::traits::Extractor<INTSXP,NA,VEC>::type VEC_EXT ;
@@ -60,7 +60,7 @@
 } ;
 template <double Func(double), typename VEC>
 class Vectorized_INTSXP<Func,false,VEC> : 
-    public VectorBase<REALSXP,false, Vectorized<Func,false,VEC> >{
+    public VectorBase<REALSXP,false, Vectorized_INTSXP<Func,false,VEC> >{
 public:
     typedef typename Rcpp::VectorBase<INTSXP,false,VEC> VEC_TYPE ;
 	typedef typename Rcpp::traits::Extractor<INTSXP,false,VEC>::type VEC_EXT ;