Merge remote-tracking branch 'upstream/master'

Author: nathan-russell

ChangeLog

@@ -7,6 +7,9 @@
 	* inst/include/Rcpp/traits/traits.h: Idem 
 	* inst/unitTests/cpp/Matrix.cpp: Idem
 	* inst/unitTests/runit.Matrix.R: Idem 
+2016-10-24  Qiang Kou  <[email protected]>
+
+        * inst/include/Rcpp/sugar/Range.h: Range sugar uses R_xlen_t as start/end type
 
 2016-10-23  Nathan Russell  <[email protected]>
 

inst/NEWS.Rd

@@ -18,6 +18,10 @@
       \item Added new Sugar functions \code{rowSums()}, \code{colSums()},
       \code{rowMeans()}, \code{colMeans()} (PR \ghpr{551} by Nathan Russell 
       fixing \ghit{549})
+      \item Added new (matrix) Sugar functions \code{eye()}, 
+      \code{ones()}, \code{zeros()} (PR \ghpr{566} by Nathan Russell)
+      \item \code{Range} Sugar now used \code{R_xlen_t} type for start/end
+      (PR \ghpr{568} by Qiang Kou)
     }
     \item Changes in Rcpp unit tests
     \itemize{

inst/include/Rcpp/sugar/Range.h

@@ -26,17 +26,17 @@ namespace Rcpp{
 
     class Range : public VectorBase<INTSXP,false, Range >{
     public:
-        Range( int start_, int end__ ) : start(start_), end_(end__){
+        Range( R_xlen_t start_, R_xlen_t end__ ) : start(start_), end_(end__){
             if( start_ > end__ ){
                 throw std::range_error( "upper value must be greater than lower value" ) ;
             }
         }
 
-        inline int size() const{
+        inline R_xlen_t size() const{
             return end_ - start + 1;
         }
 
-        inline int operator[]( int i) const {
+        inline R_xlen_t operator[]( R_xlen_t i) const {
             return start + i ;
         }
 
@@ -60,29 +60,31 @@ namespace Rcpp{
             return orig ;
         }
 
-        Range& operator+=(int n) {
+        Range& operator+=(R_xlen_t n) {
             start += n ; end_ += n ;
             return *this ;
         }
 
-        Range& operator-=(int n) {
+        Range& operator-=(R_xlen_t n) {
             start -= n ; end_ -= n ;
             return *this ;
         }
 
-        Range operator+( int n ){
+        Range operator+( R_xlen_t n ){
             return Range( start + n, end_ + n ) ;
         }
-        Range operator-( int n ){
+
+        Range operator-( R_xlen_t n ){
             return Range( start - n, end_ - n ) ;
         }
 
-        inline int get_start() const { return start ; }
-        inline int get_end() const { return end_ ; }
+        inline R_xlen_t get_start() const { return start ; }
+
+        inline R_xlen_t get_end() const { return end_ ; }
 
     private:
-        int start ;
-        int end_ ;
+        R_xlen_t start ;
+        R_xlen_t end_ ;
     } ;
 
 }