Change size_type for LAPACKFullMatrix

diff --git a/include/deal.II/lac/lapack_full_matrix.h b/include/deal.II/lac/lapack_full_matrix.h
index 8a0f3de5527b2e6624294f2b92d41062736c63ff..a2e810fc5706b26df359e6c7194c5189b3d2de6a 100644 (file)
--- a/include/deal.II/lac/lapack_full_matrix.h
+++ b/include/deal.II/lac/lapack_full_matrix.h
@@ -57,7 +57,7 @@ public:
   /**
    * Declare type for container size.
    */
-  typedef unsigned int size_type;
+  typedef std::make_unsigned<types::blas_int>::type size_type;
 
   /**
    * Constructor. Initialize the matrix as a square matrix with dimension
@@ -1007,7 +1007,7 @@ LAPACKFullMatrix<number>::eigenvalue (const size_type i) const
   Assert (state & LAPACKSupport::eigenvalues, ExcInvalidState());
   Assert (wr.size() == this->n_rows(), ExcInternalError());
   Assert (wi.size() == this->n_rows(), ExcInternalError());
-  Assert (i<this->n_rows(), ExcIndexRange(i,0,this->n_rows()));
+  AssertIndexRange (i,this->n_rows());
 
   return std::complex<number>(wr[i], wi[i]);
 }

diff --git a/source/lac/lapack_full_matrix.cc b/source/lac/lapack_full_matrix.cc
index 97b8d245bbb44c097face85ae84e5e06069daac3..b84a417b7290fe79cdd07e256b0399f449a58b88 100644 (file)
--- a/source/lac/lapack_full_matrix.cc
+++ b/source/lac/lapack_full_matrix.cc
@@ -99,8 +99,8 @@ template <typename number>
 void
 LAPACKFullMatrix<number>::remove_row_and_column (const size_type row, const size_type col)
 {
-  Assert (row<this->n_rows(), ExcIndexRange(row,0,this->n_rows()));
-  Assert (col<this->n_cols(), ExcIndexRange(col,0,this->n_cols()));
+  AssertIndexRange (row,this->n_rows());
+  AssertIndexRange (col,this->n_cols());
 
   const size_type nrows = this->n_rows()-1;
   const size_type ncols = this->n_cols()-1;
@@ -1551,7 +1551,7 @@ LAPACKFullMatrix<number>::print_formatted (
   // set output format, but store old
   // state
   std::ios::fmtflags old_flags = out.flags();
-  unsigned int old_precision = out.precision (precision);
+  std::streamsize old_precision = out.precision (precision);
 
   if (scientific)
     {