resolve warnings in RUnit

Author: thirdwing

inst/include/Rcpp/vector/Vector.h

@@ -294,8 +294,8 @@ class Vector :
 	inline const_iterator begin() const{ return cache.get_const() ; }
     inline const_iterator end() const{ return cache.get_const() + size() ; }
 
-    inline Proxy operator[]( int i ){ return cache.ref(i) ; }
-    inline const_Proxy operator[]( int i ) const { return cache.ref(i) ; }
+    inline Proxy operator[]( R_xlen_t i ){ return cache.ref(i) ; }
+    inline const_Proxy operator[]( R_xlen_t i ) const { return cache.ref(i) ; }
 
     inline Proxy operator()( const size_t& i) {
         return cache.ref( offset(i) ) ;
@@ -491,10 +491,10 @@ class Vector :
     Vector& operator+=( const VectorBase<RTYPE,true,EXPR_VEC>& rhs ) {
           const EXPR_VEC& ref = rhs.get_ref() ;
         iterator start = begin() ;
-        int n = size() ;
+        R_xlen_t n = size() ;
         // TODO: maybe unroll this
         stored_type tmp ;
-        for( int i=0; i<n; i++){
+        for( R_xlen_t i=0; i<n; i++){
             Proxy left = start[i] ;
             if( ! traits::is_na<RTYPE>( left ) ){
                 tmp = ref[i] ;
@@ -508,9 +508,9 @@ class Vector :
     Vector& operator+=( const VectorBase<RTYPE,false,EXPR_VEC>& rhs ) {
           const EXPR_VEC& ref = rhs.get_ref() ;
         iterator start = begin() ;
-        int n = size() ;
+        R_xlen_t n = size() ;
         stored_type tmp ;
-        for( int i=0; i<n; i++){
+        for( R_xlen_t i=0; i<n; i++){
             if( ! traits::is_na<RTYPE>(start[i]) ){
                 start[i] += ref[i] ;
             }

inst/include/Rcpp/vector/proxy.h

@@ -65,7 +65,7 @@ namespace internal{
 		VECTOR& parent ;
 		std::string name;
 		void set( CTYPE rhs ){
-			int index = 0 ;
+			R_xlen_t index = 0 ;
 			try{
 				index = parent.offset(name) ;
 				parent[ index ] = rhs ;
@@ -110,14 +110,14 @@ namespace internal{
 
 		inline iterator begin() { return get() ; }
 		inline iterator end(){ return begin() + size() ; }
-		inline reference operator[]( int i ){ return *( get() + i ) ; }
-		inline int size(){ return strlen( get() ) ; }
+		inline reference operator[]( R_xlen_t i ){ return *( get() + i ) ; }
+		inline R_xlen_t size(){ return strlen( get() ) ; }
 
 	private:
 		VECTOR& parent ;
 		std::string name;
 		void set( const std::string& rhs ){
-			int index = 0 ;
+			R_xlen_t index = 0 ;
 			try{
 				index = parent.offset(name) ;
 				parent[ index ] = rhs ;
@@ -176,7 +176,7 @@ namespace internal{
 		VECTOR& parent ;
 		std::string name;
 		void set( SEXP rhs ){
-			int index = 0 ;
+			R_xlen_t index = 0 ;
 			try{
 				index = parent.offset(name) ;
 				parent[ index ] = rhs ;

inst/unitTests/cpp/ListOf.cpp

@@ -84,8 +84,8 @@ NVList test_binary_ops(NVList x) {
 }
 
 // [[Rcpp::export]]
-int test_sub_calls(NVList x) {
-    int sz = x[0].size() + x[1].size() + x[2].size();
+R_xlen_t test_sub_calls(NVList x) {
+    R_xlen_t sz = x[0].size() + x[1].size() + x[2].size();
     return sz;
 }