minor simplification to #622, tested locally

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2016-12-31  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/include/Rcpp/vector/Matrix.h: Minor simplification
+
 2016-12-31  James J Balamuta  <[email protected]>
 
         * inst/include/Rcpp/vector/Matrix.h: Fixed non-symmetric case of matrix

inst/include/Rcpp/vector/Matrix.h

@@ -177,9 +177,7 @@ class Matrix : public Vector<RTYPE, StoragePolicy>, public MatrixBase<RTYPE, tru
     void fill_diag__dispatch( traits::false_type, const U& u) {
         Shield<SEXP> elem( converter_type::get( u ) );
 
-        R_xlen_t bounds = ( Matrix::nrow() < Matrix::ncol() ) ?
-                             Matrix::nrow() : Matrix::ncol();
-        
+        R_xlen_t bounds = std::min(Matrix::nrow(), Matrix::ncol());
         for (R_xlen_t i = 0; i < bounds; ++i) {
             (*this)(i, i) = elem;
         }
@@ -188,12 +186,11 @@ class Matrix : public Vector<RTYPE, StoragePolicy>, public MatrixBase<RTYPE, tru
     template <typename U>
     void fill_diag__dispatch( traits::true_type, const U& u) {
         stored_type elem = converter_type::get( u );
-		
-        R_xlen_t bounds = ( Matrix::nrow() < Matrix::ncol() ) ?
-		                 Matrix::nrow() : Matrix::ncol();
+
+        R_xlen_t bounds = std::min(Matrix::nrow(), Matrix::ncol());
 
         for (R_xlen_t i = 0; i < bounds; ++i) {
-			(*this)(i, i) = elem;
+            (*this)(i, i) = elem;
         }
     }