From ce2a215ca1469df41b92c1bee1a0f83a60a3f3f9 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Fri, 12 Feb 2010 23:12:56 +0000 Subject: [PATCH] superfluous exception removed git-svn-id: https://svn.dealii.org/trunk@20580 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/function.h | 16 +--------------- deal.II/base/source/function.cc | 5 ++--- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/deal.II/base/include/base/function.h b/deal.II/base/include/base/function.h index 85fe6e212a..aef1afca0a 100644 --- a/deal.II/base/include/base/function.h +++ b/deal.II/base/include/base/function.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -340,20 +340,6 @@ class Function : public FunctionTime, * value. */ unsigned int memory_consumption () const; - - /** @addtogroup Exceptions - * @{ */ - - /** - * Number of components does not match. - */ - DeclException2 (ExcNumberOfComponents, - int, int, - << "You can only assign function objects with the same " - << "number of components. However, here the left operand " - << "has " << arg1 << " components, and the right operand " - << arg2 << " components."); - //@} }; diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index d91b179eb1..e0c981ee3f 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -51,8 +51,7 @@ Function::~Function () template Function & Function::operator= (const Function &f) { - Assert (n_components == f.n_components, - ExcNumberOfComponents(n_components,f.n_components)); + AssertDimension (n_components, f.n_components); return *this; } -- 2.39.5