From: Guido Kanschat Date: Tue, 11 Mar 2003 09:58:27 +0000 (+0000) Subject: exception replaced X-Git-Tag: v8.0.0~16790 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62db421fb45b92293fd43356de333d56b89a747c;p=dealii.git exception replaced git-svn-id: https://svn.dealii.org/trunk@7309 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/block_sparse_matrix.h b/deal.II/lac/include/lac/block_sparse_matrix.h index 2038726c43..3aa562bcdf 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.h @@ -668,10 +668,6 @@ class BlockSparseMatrix : public Subscriptor */ DeclException0 (ExcMatrixNotBlockSquare); - /** - * Exception. - */ - DeclException0 (ExcIncompatibleObjects); private: /** diff --git a/deal.II/lac/include/lac/block_sparse_matrix.templates.h b/deal.II/lac/include/lac/block_sparse_matrix.templates.h index 2bb7eaef37..9673f891f0 100644 --- a/deal.II/lac/include/lac/block_sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/block_sparse_matrix.templates.h @@ -1,4 +1,4 @@ -//---------------------------- block_sparse_matrix.templates.h --------------------------- +//------------------------------------------------------------------------------- // $Id$ // Version: $Name$ // @@ -9,7 +9,7 @@ // to the file deal.II/doc/license.html for the text and // further information on this license. // -//---------------------------- block_sparse_matrix.templates.h --------------------------- +//------------------------------------------------------------------------------- #ifndef __deal2__block_sparse_matrix_templates_h #define __deal2__block_sparse_matrix_templates_h @@ -61,8 +61,8 @@ BlockSparseMatrix & BlockSparseMatrix:: operator = (const BlockSparseMatrix &m) { - Assert (rows == m.rows, ExcIncompatibleObjects()); - Assert (columns == m.columns, ExcIncompatibleObjects()); + Assert (rows == m.rows, ExcDimensionMismatch(rows, m.rows)); + Assert (columns == m.columns, ExcDimensionMismatch(columns, m.columns)); // this operator does not do // anything except than checking // whether the base objects want to