use static_cast<R_xlen_t> for type casting

thirdwing · thirdwing · commit af61f01bca66 · 2015-06-03T23:36:50.000-04:00
diff --git a/inst/include/Rcpp/sugar/matrix/as_vector.h b/inst/include/Rcpp/sugar/matrix/as_vector.h
@@ -30,7 +30,7 @@ inline Rcpp::Vector<RTYPE>
 as_vector__impl( MatrixBase<RTYPE,NA,T>& t, Rcpp::traits::false_type ){
     T& ref = t.get_ref() ;
     int nc = ref.ncol(), nr = ref.nrow() ;
-    Vector<RTYPE> out (((R_xlen_t)nr) * nc) ;
+    Vector<RTYPE> out (static_cast<R_xlen_t>(nr) * nc) ;
     R_xlen_t k =0;
     for( int col_index=0; col_index<nc; col_index++)
         for( int row_index=0; row_index<nr; row_index++, k++)
@@ -43,7 +43,7 @@ template <int RTYPE, bool NA, typename T>
 inline Rcpp::Vector<RTYPE>
 as_vector__impl( MatrixBase<RTYPE,NA,T>& t, Rcpp::traits::true_type ){
     Matrix<RTYPE>& ref = t.get_ref() ;
-    R_xlen_t size = ((R_xlen_t)ref.ncol())*ref.nrow() ;
+    R_xlen_t size = static_cast<R_xlen_t>(ref.ncol())*ref.nrow() ;
     typename Rcpp::Vector<RTYPE>::const_iterator first(static_cast<const Rcpp::Vector<RTYPE>&>(ref).begin())  ;
     return Vector<RTYPE>(first, first+size );
 }
diff --git a/inst/include/Rcpp/sugar/matrix/col.h b/inst/include/Rcpp/sugar/matrix/col.h
@@ -40,7 +40,7 @@ class Col : public MatrixBase<
 		return j + 1 ;
 	}
 
-	inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }
+	inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }
 	inline int nrow() const { return nr; }
 	inline int ncol() const { return nc; }
 
diff --git a/inst/include/Rcpp/sugar/matrix/diag.h b/inst/include/Rcpp/sugar/matrix/diag.h
@@ -59,7 +59,7 @@ class Diag_Maker : public Rcpp::MatrixBase< RTYPE ,NA, Diag_Maker<RTYPE,NA,T> >
 	inline STORAGE operator()( int i, int j ) const {
 		return (i==j) ? object[i] : 0 ;
 	}
-	inline R_xlen_t size() const { return ((R_xlen_t)n) * n; }
+	inline R_xlen_t size() const { return static_cast<R_xlen_t>(n) * n; }
 	inline int ncol() const { return n; }
 	inline int nrow() const { return n; }
 
diff --git a/inst/include/Rcpp/sugar/matrix/lower_tri.h b/inst/include/Rcpp/sugar/matrix/lower_tri.h
@@ -47,7 +47,7 @@ class LowerTri : public VectorBase<
 		return get(i,j) ;
 	}
 
-	inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }
+	inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }
 	inline int nrow() const { return nr; }
 	inline int ncol() const { return nc; }
 
diff --git a/inst/include/Rcpp/sugar/matrix/outer.h b/inst/include/Rcpp/sugar/matrix/outer.h
@@ -57,7 +57,7 @@ class Outer : public MatrixBase<
         return converter_type::get( fun( lhs[i], rhs[j] ) );
     }
 
-    inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }
+    inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }
     inline int nrow() const { return nr; }
     inline int ncol() const { return nc; }
 
diff --git a/inst/include/Rcpp/sugar/matrix/row.h b/inst/include/Rcpp/sugar/matrix/row.h
@@ -40,7 +40,7 @@ class Row : public MatrixBase<
 		return i + 1 ;
 	}
 
-	inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }
+	inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }
 	inline int nrow() const { return nr; }
 	inline int ncol() const { return nc; }
 
diff --git a/inst/include/Rcpp/sugar/matrix/upper_tri.h b/inst/include/Rcpp/sugar/matrix/upper_tri.h
@@ -42,7 +42,7 @@ class UpperTri : public VectorBase<
 		return get(i,j) ;
 	}
 
-	inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }
+	inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }
 	inline int nrow() const { return nr; }
 	inline int ncol() const { return nc; }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Col : public MatrixBase<`
`40`	`40`	`return j + 1 ;`
`41`	`41`	`}`
`42`	`42`
`43`		`- inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }`
	`43`	`+ inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }`
`44`	`44`	`inline int nrow() const { return nr; }`
`45`	`45`	`inline int ncol() const { return nc; }`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class Diag_Maker : public Rcpp::MatrixBase< RTYPE ,NA, Diag_Maker<RTYPE,NA,T> >`
`59`	`59`	`inline STORAGE operator()( int i, int j ) const {`
`60`	`60`	`return (i==j) ? object[i] : 0 ;`
`61`	`61`	`}`
`62`		`- inline R_xlen_t size() const { return ((R_xlen_t)n) * n; }`
	`62`	`+ inline R_xlen_t size() const { return static_cast<R_xlen_t>(n) * n; }`
`63`	`63`	`inline int ncol() const { return n; }`
`64`	`64`	`inline int nrow() const { return n; }`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class LowerTri : public VectorBase<`
`47`	`47`	`return get(i,j) ;`
`48`	`48`	`}`
`49`	`49`
`50`		`- inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }`
	`50`	`+ inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }`
`51`	`51`	`inline int nrow() const { return nr; }`
`52`	`52`	`inline int ncol() const { return nc; }`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class Outer : public MatrixBase<`
`57`	`57`	`return converter_type::get( fun( lhs[i], rhs[j] ) );`
`58`	`58`	`}`
`59`	`59`
`60`		`- inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }`
	`60`	`+ inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }`
`61`	`61`	`inline int nrow() const { return nr; }`
`62`	`62`	`inline int ncol() const { return nc; }`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Row : public MatrixBase<`
`40`	`40`	`return i + 1 ;`
`41`	`41`	`}`
`42`	`42`
`43`		`- inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }`
	`43`	`+ inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }`
`44`	`44`	`inline int nrow() const { return nr; }`
`45`	`45`	`inline int ncol() const { return nc; }`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class UpperTri : public VectorBase<`
`42`	`42`	`return get(i,j) ;`
`43`	`43`	`}`
`44`	`44`
`45`		`- inline R_xlen_t size() const { return ((R_xlen_t)nr) * nc ; }`
	`45`	`+ inline R_xlen_t size() const { return static_cast<R_xlen_t>(nr) * nc ; }`
`46`	`46`	`inline int nrow() const { return nr; }`
`47`	`47`	`inline int ncol() const { return nc; }`
`48`	`48`