Aug 25, 2015 · Aug 17, 2015 · Aug 17, 2015 · Aug 18, 2015 · Aug 19, 2015 · Aug 19, 2015
diff --git a/inst/include/Rcpp/vector/Vector.h b/inst/include/Rcpp/vector/Vector.h
    /**
     * offset based on the dimensions of this vector
     */
 size_t offset(constsize_t& i, constsize_t& j) const {
 R_xlen_t offset(constint& i, constint& j) const {
        if( !::Rf_isMatrix(Storage::get__()) ) throw not_a_matrix() ;

        /* we need to extract the dimensions */
 int *dim = dims() ;
 size_tnrow =static_cast<size_t>(dim[0]) ;
 size_tncol =static_cast<size_t>(dim[1]) ;
        if(i >= nrow || j >= ncol ) throw index_out_of_bounds() ;
        return i + nrow*j ;
 const int*dim = dims() ;
 const intnrow = dim[0] ;
 const intncol = dim[1] ;
        if(i < 0||i >= nrow || j < 0 || j >= ncol ) throw index_out_of_bounds() ;
        return i +static_cast<R_xlen_t>(nrow)*j ;
    }

    /**
     * one dimensional offset doing bounds checking to ensure
     * it is valid
     */
 size_t offset(constsize_t& i) const {
        if( static_cast<R_xlen_t>(i) >= ::Rf_xlength(Storage::get__()) ) throw index_out_of_bounds() ;
 R_xlen_t offset(constR_xlen_t& i) const {
        if(i < 0 || i >= ::Rf_xlength(Storage::get__()) ) throw index_out_of_bounds() ;
        return i ;
    }


    R_xlen_t offset(const std::string& name) const {
        SEXP names = RCPP_GET_NAMES( Storage::get__() ) ;
        if( Rf_isNull(names) ) throw index_out_of_bounds();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -278,26 +278,26 @@ class Vector :
		/**
		* offset based on the dimensions of this vector
		*/
		size_t offset(constsize_t& i, constsize_t& j) const {
		R_xlen_t offset(constint& i, constint& j) const {
		if( !::Rf_isMatrix(Storage::get__()) ) throw not_a_matrix() ;

		/* we need to extract the dimensions */
		int *dim = dims() ;
		size_tnrow =static_cast<size_t>(dim[0]) ;
		size_tncol =static_cast<size_t>(dim[1]) ;
		if(i >= nrow \|\| j >= ncol ) throw index_out_of_bounds() ;
		return i + nrow*j ;
		const int*dim = dims() ;
		const intnrow = dim[0] ;
		const intncol = dim[1] ;
		if(i < 0\|\|i >= nrow \|\| j < 0 \|\| j >= ncol ) throw index_out_of_bounds() ;
		return i +static_cast<R_xlen_t>(nrow)*j ;
		}

		/**
		* one dimensional offset doing bounds checking to ensure
		* it is valid
		*/
		size_t offset(constsize_t& i) const {
		if( static_cast<R_xlen_t>(i) >= ::Rf_xlength(Storage::get__()) ) throw index_out_of_bounds() ;
		R_xlen_t offset(constR_xlen_t& i) const {
		if(i < 0 \|\| i >= ::Rf_xlength(Storage::get__()) ) throw index_out_of_bounds() ;
		return i ;
		}


		R_xlen_t offset(const std::string& name) const {
		SEXP names = RCPP_GET_NAMES( Storage::get__() ) ;
		if( Rf_isNull(names) ) throw index_out_of_bounds();
Expand Down