vector fixed

Author: Qiang Kou

inst/include/Rcpp/api/meat/wrap.h

@@ -28,13 +28,13 @@ namespace internal{
 template <typename InputIterator, typename KEY, typename VALUE, int RTYPE>
 inline SEXP range_wrap_dispatch___impl__pair( InputIterator first, InputIterator last, Rcpp::traits::true_type ){
 	RCPP_DEBUG_3( "range_wrap_dispatch___impl__pair<KEY = %s, VALUE = %s, RTYPE = %d>\n", DEMANGLE(KEY), DEMANGLE(VALUE), RTYPE)
-    size_t size = std::distance( first, last ) ;
+    R_xlen_t size = std::distance( first, last ) ;
 	//typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
 
 	CharacterVector names(size) ;
 	Vector<RTYPE> x(size) ;
 	Rcpp::String buffer ;
-	for( size_t i = 0; i < size ; i++, ++first){
+	for( R_xlen_t i = 0; i < size ; i++, ++first){
         buffer   = first->first ;
         x[i]     = first->second ;
         names[i] = buffer ;
@@ -45,12 +45,12 @@ inline SEXP range_wrap_dispatch___impl__pair( InputIterator first, InputIterator
 
 template <typename InputIterator, typename KEY, typename VALUE, int RTYPE>
 inline SEXP range_wrap_dispatch___impl__pair( InputIterator first, InputIterator last, Rcpp::traits::false_type ){
-	size_t size = std::distance( first, last ) ;
+	R_xlen_t size = std::distance( first, last ) ;
 
 	Shield<SEXP> names( Rf_allocVector(STRSXP, size) ) ;
 	Shield<SEXP> x( Rf_allocVector(VECSXP, size) ) ;
 	Rcpp::String buffer ;
-	for( size_t i = 0; i < size ; i++, ++first){
+	for( R_xlen_t i = 0; i < size ; i++, ++first){
         buffer = first->first ;
         SET_VECTOR_ELT( x, i, Rcpp::wrap(first->second) );
         SET_STRING_ELT( names, i, buffer.get_sexp() ) ;

inst/include/Rcpp/vector/Vector.h

@@ -89,6 +89,12 @@ class Vector :
         fill( u ) ;
     }
 
+    explicit Vector( const int& size, const stored_type& u ) {
+        RCPP_DEBUG_2( "Vector<%d>( const R_xlen_t& size = %d, const stored_type& u )", RTYPE, size)
+        Storage::set__( Rf_allocVector( RTYPE, size) ) ;
+        fill( u ) ;
+    }
+
     // constructor for CharacterVector()
     Vector( const std::string& st ){
         RCPP_DEBUG_2( "Vector<%d>( const std::string& = %s )", RTYPE, st.c_str() )
@@ -101,7 +107,7 @@ class Vector :
         Storage::set__(internal::vector_from_string<RTYPE>(st) ) ;
     }
 
-    Vector( const int& siz, stored_type (*gen)(void) ) {
+    explicit Vector( const int& siz, stored_type (*gen)(void) ) {
         RCPP_DEBUG_2( "Vector<%d>( const int& siz = %s, stored_type (*gen)(void) )", RTYPE, siz )
         Storage::set__( Rf_allocVector( RTYPE, siz) ) ;
         std::generate( begin(), end(), gen );
@@ -162,6 +168,12 @@ class Vector :
         Storage::set__( Rf_allocVector( RTYPE, size) ) ;
         fill_or_generate( u ) ;
     }
+    template <typename U>
+    Vector( const int& size, const U& u) {
+        RCPP_DEBUG_2( "Vector<%d>( const int& size, const U& u )", RTYPE, size )
+        Storage::set__( Rf_allocVector( RTYPE, size) ) ;
+        fill_or_generate( u ) ;
+    }
     template <bool NA, typename T>
     Vector( const sugar::SingleLogicalResult<NA,T>& obj ) {
         Storage::set__( r_cast<RTYPE>( const_cast<sugar::SingleLogicalResult<NA,T>&>(obj).get_sexp() ) ) ;