From: Wolfgang Bangerth Date: Mon, 13 Feb 2006 00:35:02 +0000 (+0000) Subject: Avoid a conflict between the two fill() functions. Since the type of the X-Git-Tag: v8.0.0~12336 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1746ad81d42c494a6f1713c5bd2142675badbd8e;p=dealii.git Avoid a conflict between the two fill() functions. Since the type of the single value has to be convertible to the type of the table elements anyway, there is no point in not asking that it be correct already when passed to the function. git-svn-id: https://svn.dealii.org/trunk@12344 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/table.h b/deal.II/base/include/base/table.h index f208761e34..13909f92ee 100644 --- a/deal.II/base/include/base/table.h +++ b/deal.II/base/include/base/table.h @@ -615,12 +615,9 @@ class TableBase : public Subscriptor /** * Fill all table entries with - * the same value. The type of - * value must be convertible to t - * he value type of the table. + * the same value. */ - template - void fill (const T2& value); + void fill (const T& value); /** * Return a read-write reference @@ -1846,13 +1843,14 @@ TableBase::reset_values () } + template -template +inline void -TableBase::fill (const T2& value) +TableBase::fill (const T& value) { if (n_elements() != 0) - std::fill_n(val, n_elements(), value); + std::fill_n (val, n_elements(), value); }