Skip to content

Commit c4a9b16

Browse files
author
Qiang Kou
committed
sugar block
1 parent 2f09b74 commit c4a9b16

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

‎inst/include/Rcpp/DataFrame.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ namespace Rcpp{
103103
bool use_default_strings_as_factors = true ;
104104
bool strings_as_factors = true ;
105105
int strings_as_factors_index = -1 ;
106-
int n = obj.size() ;
106+
R_xlen_t n = obj.size() ;
107107
CharacterVector names = obj.attr( "names" ) ;
108108
if( !names.isNULL() ){
109109
for( int i=0; i<n; i++){

‎inst/include/Rcpp/Fast.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ class Fast {
3030

3131
Fast( const VECTOR& v_) : v(v_), data( v_.begin() ){}
3232

33-
inline value_type& operator[]( int i){ return data[i] ; }
34-
inline const value_type& operator[]( int i) const { return data[i] ; }
35-
inline int size() const { return v.size() ; }
33+
inline value_type& operator[]( R_xlen_t i){ return data[i] ; }
34+
inline const value_type& operator[]( R_xlen_t i) const { return data[i] ; }
35+
inline R_xlen_t size() const { return v.size() ; }
3636

3737
private:
3838
const VECTOR& v ;

‎inst/include/Rcpp/Language.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ namespace Rcpp{
180180
class unary_call : public std::unary_function<T,RESULT_TYPE> {
181181
public:
182182
unary_call( Language call_ ) : call(call_), proxy(call_,1) {}
183-
unary_call( Language call_, int index ) : call(call_), proxy(call_,index){}
183+
unary_call( Language call_, R_xlen_t index ) : call(call_), proxy(call_,index){}
184184
unary_call( Function fun ) : call( fun, R_NilValue), proxy(call,1) {}
185185

186186
RESULT_TYPE operator()( const T& object ){
@@ -197,7 +197,7 @@ namespace Rcpp{
197197
class binary_call : public std::binary_function<T1,T2,RESULT_TYPE> {
198198
public:
199199
binary_call( Language call_ ) : call(call_), proxy1(call_,1), proxy2(call_,2) {}
200-
binary_call( Language call_, int index1, int index2 ) : call(call_), proxy1(call_,index1), proxy2(call_,index2){}
200+
binary_call( Language call_, R_xlen_t index1, R_xlen_t index2 ) : call(call_), proxy1(call_,index1), proxy2(call_,index2){}
201201
binary_call( Function fun) : call(fun, R_NilValue, R_NilValue), proxy1(call,1), proxy2(call,2){}
202202

203203
RESULT_TYPE operator()( const T1& o1, const T2& o2 ){

‎inst/include/Rcpp/sugar/block/SugarBlock_1.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class SugarBlock_1 : public Rcpp::VectorBase< Rcpp::traits::r_sexptype_traits<RE
3131
typedef RESULT_TYPE (*FunPtr)(U1) ;
3232
SugarBlock_1( FunPtr ptr_, const T1 & vec_) : ptr(ptr_), vec(vec_){}
3333

34-
inline RESULT_TYPE operator[]( int i) const {
34+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
3535
return ptr( vec[i] ) ;
3636
}
37-
inline int size() const { return vec.size() ; }
37+
inline R_xlen_t size() const { return vec.size() ; }
3838

3939
private:
4040
FunPtr ptr ;

‎inst/include/Rcpp/sugar/block/SugarBlock_2.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class SugarBlock_2 : public Rcpp::VectorBase< Rcpp::traits::r_sexptype_traits<RE
3434
// TODO: check that x and y have same size
3535
}
3636

37-
inline RESULT_TYPE operator[]( int i) const {
37+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
3838
return ptr( x[i], y[i] ) ;
3939
}
40-
inline int size() const { return x.size() ; }
40+
inline R_xlen_t size() const { return x.size() ; }
4141

4242
private:
4343
FunPtr ptr ;
@@ -53,10 +53,10 @@ class SugarBlock_2__VP : public Rcpp::VectorBase< Rcpp::traits::r_sexptype_trait
5353
SugarBlock_2__VP( FunPtr ptr_, const T1 & x_, U2 u2 ) :
5454
ptr(ptr_), x(x_), y(u2){}
5555

56-
inline RESULT_TYPE operator[]( int i) const {
56+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
5757
return ptr( x[i], y ) ;
5858
}
59-
inline int size() const { return x.size() ; }
59+
inline R_xlen_t size() const { return x.size() ; }
6060

6161
private:
6262
FunPtr ptr ;
@@ -71,10 +71,10 @@ class SugarBlock_2__PV : public Rcpp::VectorBase< Rcpp::traits::r_sexptype_trait
7171
SugarBlock_2__PV( FunPtr ptr_, U1 u1, const T2& y_ ) :
7272
ptr(ptr_), x(u1), y(y_){}
7373

74-
inline RESULT_TYPE operator[]( int i) const {
74+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
7575
return ptr( x, y[i] ) ;
7676
}
77-
inline int size() const { return y.size() ; }
77+
inline R_xlen_t size() const { return y.size() ; }
7878

7979
private:
8080
FunPtr ptr ;

‎inst/include/Rcpp/sugar/block/SugarBlock_3.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class SugarBlock_3_VVV : public Rcpp::VectorBase<
4141
ptr(ptr_), x(x_), y(y_), z(z_) {
4242
// TODO: size checks, recycling, etc ...
4343
}
44-
inline RESULT_TYPE operator[]( int i) const {
44+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
4545
return ptr( x[i], y[i], z[i] ) ;
4646
}
47-
inline int size() const { return x.size() ; }
47+
inline R_xlen_t size() const { return x.size() ; }
4848

4949
private:
5050
FunPtr ptr ;

‎inst/include/Rcpp/sugar/block/SugarMath.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ class SugarMath_1 : public Rcpp::VectorBase<
3737

3838
SugarMath_1( FunPtr ptr_, const VEC_TYPE & vec_) : ptr(ptr_), vec(vec_){}
3939

40-
inline RESULT_TYPE operator[]( int i) const {
40+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
4141
U1 x = vec[i] ;
4242
if( ISNAN(x) ) return x;
4343
return ptr( x ) ;
4444
}
45-
inline int size() const { return vec.size() ; }
45+
inline R_xlen_t size() const { return vec.size() ; }
4646

4747
private:
4848
FunPtr ptr ;
@@ -60,12 +60,12 @@ class SugarMath_1<NA,RESULT_TYPE,int,T1,FunPtr> : public Rcpp::VectorBase<
6060

6161
SugarMath_1( FunPtr ptr_, const VEC_TYPE & vec_) : ptr(ptr_), vec(vec_){}
6262

63-
inline RESULT_TYPE operator[]( int i) const {
63+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
6464
int x = vec[i] ;
6565
if( Rcpp::traits::is_na<INTSXP>(x) ) return Rcpp::traits::get_na<REALSXP>( ) ;
6666
return ptr( x ) ;
6767
}
68-
inline int size() const { return vec.size() ; }
68+
inline R_xlen_t size() const { return vec.size() ; }
6969

7070
private:
7171
FunPtr ptr ;
@@ -83,10 +83,10 @@ Rcpp::VectorBase<
8383
typedef Rcpp::VectorBase< INTSXP ,false,T1> VEC_TYPE ;
8484
SugarMath_1( FunPtr ptr_, const VEC_TYPE & vec_) : ptr(ptr_), vec(vec_){}
8585

86-
inline RESULT_TYPE operator[]( int i) const {
86+
inline RESULT_TYPE operator[]( R_xlen_t i) const {
8787
return ptr( vec[i] ) ;
8888
}
89-
inline int size() const { return vec.size() ; }
89+
inline R_xlen_t size() const { return vec.size() ; }
9090

9191
private:
9292
FunPtr ptr ;

‎inst/include/Rcpp/sugar/block/Vectorized_Math.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class Vectorized : public VectorBase<REALSXP, NA, Vectorized<Func,NA,VEC> >{
3434
typedef typename Rcpp::traits::Extractor<REALSXP,NA,VEC>::type VEC_EXT ;
3535

3636
Vectorized( const VEC_TYPE& object_) : object( object_.get_ref() ){}
37-
inline double operator[]( int i) const {
37+
inline double operator[]( R_xlen_t i) const {
3838
return Func( object[i] ) ;
3939
}
40-
inline int size() const { return object.size(); }
40+
inline R_xlen_t size() const { return object.size(); }
4141

4242
private:
4343
const VEC_EXT& object ;
@@ -50,12 +50,12 @@ class Vectorized_INTSXP : public VectorBase<REALSXP, NA, Vectorized_INTSXP<Func,
5050
typedef typename Rcpp::traits::Extractor<INTSXP,NA,VEC>::type VEC_EXT ;
5151

5252
Vectorized_INTSXP( const VEC_TYPE& object_) : object( object_.get_ref() ){}
53-
inline double operator[]( int i) const {
53+
inline double operator[]( R_xlen_t i) const {
5454
int x = object[i] ;
5555
if( x == NA_INTEGER ) return NA_REAL ;
5656
return Func( x ) ;
5757
}
58-
inline int size() const { return object.size(); }
58+
inline R_xlen_t size() const { return object.size(); }
5959

6060
private:
6161
const VEC_EXT& object ;
@@ -68,10 +68,10 @@ class Vectorized_INTSXP<Func,false,VEC> :
6868
typedef typename Rcpp::traits::Extractor<INTSXP,false,VEC>::type VEC_EXT ;
6969

7070
Vectorized_INTSXP( const VEC_TYPE& object_) : object( object_.get_ref() ){}
71-
inline double operator[]( int i) const {
71+
inline double operator[]( R_xlen_t i) const {
7272
return Func( object[i] ) ;
7373
}
74-
inline int size() const { return object.size(); }
74+
inline R_xlen_t size() const { return object.size(); }
7575

7676
private:
7777
const VEC_EXT& object ;

0 commit comments

Comments
 (0)