fixed const correctness of Vector::const_iterator. closes #209

Author: romainfrancois

inst/NEWS.Rd

@@ -16,6 +16,8 @@
       implementation in Rcpp11)
       \item Pairlist objects are now protected via an additional \code{Shield<>}
       as suggested by Martin Morgan on the rcpp-devel list.
+      \item Fixed \code{const} correctness of \code{Vector::const\_iterator}. Problem
+      raised by Martyn Plummer on \code{Rcpp-devel}. 
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/sugar/functions/setdiff.h

@@ -2,7 +2,7 @@
 //
 // setdiff.h: Rcpp R/C++ interface class library -- setdiff
 //
-// Copyright (C) 2012   Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2014  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -55,7 +55,7 @@ namespace sugar{
         Vector<RTYPE> get() const {
             int n = lhs_set.size() ;
             Vector<RTYPE> out = no_init(n) ;
-            std::copy( lhs_set.begin(), lhs_set.end(), get_const_begin(out) ) ;
+            std::copy( lhs_set.begin(), lhs_set.end(), out.begin() ) ;
             return out ;
         }
 
@@ -120,7 +120,7 @@ namespace sugar{
         Vector<RTYPE> get() const {
             int n = intersect.size() ;
             Vector<RTYPE> out = no_init(n) ;
-            std::copy( intersect.begin(), intersect.end(), get_const_begin(out) ) ;
+            std::copy( intersect.begin(), intersect.end(), out.begin() ) ;
             return out ;
         }
 
@@ -145,7 +145,7 @@ namespace sugar{
         Vector<RTYPE> get() const {
             int n = result.size() ;
             Vector<RTYPE> out = no_init(n) ;
-            std::copy( result.begin(), result.end(), get_const_begin(out) ) ;
+            std::copy( result.begin(), result.end(), out.begin() ) ;
             return out ;
         }
 

inst/include/Rcpp/sugar/matrix/as_vector.h

@@ -2,7 +2,7 @@
 //
 // as_vector.h: Rcpp R/C++ interface class library -- as_vector( sugar matrix expression )
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2014 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -44,7 +44,7 @@ inline Rcpp::Vector<RTYPE>
 as_vector__impl( MatrixBase<RTYPE,NA,T>& t, Rcpp::traits::true_type ){
     Matrix<RTYPE>& ref = t.get_ref() ;
     int size = ref.ncol()*ref.nrow() ;
-    typename Rcpp::Vector<RTYPE>::iterator first(static_cast<const Rcpp::Vector<RTYPE>&>(ref).begin())  ;
+    typename Rcpp::Vector<RTYPE>::const_iterator first(static_cast<const Rcpp::Vector<RTYPE>&>(ref).begin())  ;
     return Vector<RTYPE>(first, first+size );
 }
 

inst/include/Rcpp/sugar/nona/nona.h

@@ -46,7 +46,7 @@ namespace sugar {
     public:
         typedef typename Rcpp::VectorBase<RTYPE,NA, Rcpp::Vector<RTYPE> > SUGAR_TYPE ;
         typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
-        typedef typename Rcpp::Vector<RTYPE>::iterator iterator ;
+        typedef typename Rcpp::Vector<RTYPE>::const_iterator iterator ;
 
         Nona( const SUGAR_TYPE& expr) : data(expr.get_ref().begin()), n(expr.size()){}