From 88749bb21544c6e54f7cef330b99f5bea5fdff69 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 2 Feb 2018 11:14:40 +0100 Subject: [PATCH] Change size_type for LAPACKFullMatrix --- include/deal.II/lac/lapack_full_matrix.h | 4 ++-- source/lac/lapack_full_matrix.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/deal.II/lac/lapack_full_matrix.h b/include/deal.II/lac/lapack_full_matrix.h index 8a0f3de552..a2e810fc57 100644 --- 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::type size_type; /** * Constructor. Initialize the matrix as a square matrix with dimension @@ -1007,7 +1007,7 @@ LAPACKFullMatrix::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 (in_rows(), ExcIndexRange(i,0,this->n_rows())); + AssertIndexRange (i,this->n_rows()); return std::complex(wr[i], wi[i]); } diff --git a/source/lac/lapack_full_matrix.cc b/source/lac/lapack_full_matrix.cc index 97b8d245bb..b84a417b72 100644 --- a/source/lac/lapack_full_matrix.cc +++ b/source/lac/lapack_full_matrix.cc @@ -99,8 +99,8 @@ template void LAPACKFullMatrix::remove_row_and_column (const size_type row, const size_type col) { - Assert (rown_rows(), ExcIndexRange(row,0,this->n_rows())); - Assert (coln_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::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) { -- 2.39.5