Vector(SEXP) ctor needs a r_cast

Author: romainfrancois

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

@@ -31,9 +31,10 @@ namespace Rcpp{
     }
 
     template <int RTYPE, template <class> class StoragePolicy>
-    template <typename U>
-    Vector<RTYPE, StoragePolicy>::Vector( const U& obj) {
-        Storage::set__( r_cast<RTYPE>( wrap(obj) ) ) ;
+    template <bool NA, typename VEC>
+    Vector<RTYPE, StoragePolicy>::Vector( const VectorBase<RTYPE,NA,VEC>& other ) {
+        RCPP_DEBUG_2( "Vector<%d>( const VectorBase<RTYPE,NA,VEC>& ) [VEC = %s]", RTYPE, DEMANGLE(VEC) )
+        import_sugar_expression( other, typename traits::same_type<Vector,VEC>::type() ) ;
     }
 
     template <int RTYPE, template <class> class StoragePolicy>
@@ -128,14 +129,6 @@ namespace Rcpp{
         RCPP_DEBUG_2( "Vector<%d>( InputIterator, InputIterator, Func, int n = %d )", RTYPE, n )
         std::transform( first, last, begin(), func) ;
     }
-          
-    
-    template <int RTYPE, template <class> class StoragePolicy>
-    template <bool NA, typename VEC>
-    Vector<RTYPE, StoragePolicy>::Vector( const VectorBase<RTYPE,NA,VEC>& other ) {
-        RCPP_DEBUG_2( "Vector<%d>( const VectorBase<RTYPE,NA,VEC>& ) [VEC = %s]", RTYPE, DEMANGLE(VEC) )
-        import_sugar_expression( other, typename traits::same_type<Vector,VEC>::type() ) ;
-    }
 
     template <int RTYPE, template <class> class StoragePolicy>
     template <bool NA, typename T>

inst/include/Rcpp/vector/Vector.h

@@ -69,12 +69,9 @@ class Vector :
     }                                           
 
     Vector( SEXP x ) {
-        Storage::set__(x) ;
+        Storage::set__( r_cast<RTYPE>(x) ) ;
     }
 
-    template <typename U>
-    explicit Vector( const U& obj) ;
-    
     explicit Vector( const no_init& obj) {
         Storage::set__( Rf_allocVector( RTYPE, obj.get() ) ) ;
     }