From 1240f79a91623da06c980d2d3386e33277cf1d2f Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Wed, 23 Mar 2005 00:48:46 +0000 Subject: [PATCH] two exotic exceptions replaced git-svn-id: https://svn.dealii.org/trunk@10207 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/function_lib.h | 23 +++-------------------- deal.II/base/source/function_lib.cc | 16 +++++++++------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index 98176eeb1a..c2ba84eef2 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -1,15 +1,15 @@ -//---------------------------- function_lib.h --------------------------- +//--------------------------------------------------------------------------- // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal authors +// Copyright (C) 1998 - 2005 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer // to the file deal.II/doc/license.html for the text and // further information on this license. // -//---------------------------- function_lib.h --------------------------- +//--------------------------------------------------------------------------- #ifndef __deal2__function_lib_h #define __deal2__function_lib_h @@ -751,15 +751,6 @@ namespace Functions */ virtual double laplacian (const Point &p, const unsigned int component = 0) const; - - /** @addtogroup Exceptions - * @{ */ - - /** - * Exception - */ - DeclException0 (ExcInvalidArraySize); - //@} private: /** * Stored Fourier coefficients @@ -821,14 +812,6 @@ namespace Functions virtual double laplacian (const Point &p, const unsigned int component = 0) const; - /** @addtogroup Exceptions - * @{ */ - - /** - * Exception - */ - DeclException0 (ExcInvalidArraySize); - //@} private: /** * Stored Fourier coefficients diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index c6879c4563..bf66b4c27f 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -1,15 +1,15 @@ -//---------------------------- function_lib.cc --------------------------- +//--------------------------------------------------------------------------- // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal authors +// Copyright (C) 1998 - 2005 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer // to the file deal.II/doc/license.html for the text and // further information on this license. // -//---------------------------- function_lib.cc --------------------------- +//--------------------------------------------------------------------------- #include @@ -1330,9 +1330,10 @@ namespace Functions fourier_coefficients (fourier_coefficients), weights (weights) { - Assert (fourier_coefficients.size() > 0, ExcInvalidArraySize()); + Assert (fourier_coefficients.size() > 0, ExcZero()); Assert (fourier_coefficients.size() == weights.size(), - ExcInvalidArraySize()); + ExcDimensionMismatch(fourier_coefficients.size(), + weights.size())); } @@ -1401,9 +1402,10 @@ namespace Functions fourier_coefficients (fourier_coefficients), weights (weights) { - Assert (fourier_coefficients.size() > 0, ExcInvalidArraySize()); + Assert (fourier_coefficients.size() > 0, ExcZero()); Assert (fourier_coefficients.size() == weights.size(), - ExcInvalidArraySize()); + ExcDimensionMismatch(fourier_coefficients.size(), + weights.size())); } -- 2.39.5