From b9aaef8d0a97d0f60d4ca481c8123d61e2c0c546 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 21 Dec 2013 15:02:23 +0000 Subject: [PATCH] Properly call the template arguments 'InputIterator', rather than 'ForwardIterator'. git-svn-id: https://svn.dealii.org/trunk@32085 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/table.h | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/deal.II/include/deal.II/base/table.h b/deal.II/include/deal.II/base/table.h index d898917f70..d753836bd8 100644 --- a/deal.II/include/deal.II/base/table.h +++ b/deal.II/include/deal.II/base/table.h @@ -488,9 +488,9 @@ public: * component, and then initialize the elements of the table using the * second and third argument by calling fill(entries,C_style_indexing). */ - template + template TableBase (const TableIndices &sizes, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing = true); /** @@ -634,8 +634,8 @@ public: * subsequent elements of the input range. If false, change * the first index fastest. */ - template - void fill (ForwardIterator entries, + template + void fill (InputIterator entries, const bool C_style_indexing = true); /** @@ -857,9 +857,9 @@ public: * subsequent elements of the input range. If false, change * the first index fastest. */ - template + template Table (const unsigned int size, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing = true); /** @@ -994,10 +994,10 @@ public: * subsequent elements of the input range. If false, change * the first index fastest. */ - template + template Table (const unsigned int size1, const unsigned int size2, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing = true); /** @@ -1222,11 +1222,11 @@ public: * subsequent elements of the input range. If false, change * the first index fastest. */ - template + template Table (const unsigned int size1, const unsigned int size2, const unsigned int size3, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing = true); /** @@ -1903,10 +1903,10 @@ TableBase::TableBase (const TableIndices &sizes) template -template +template TableBase:: TableBase (const TableIndices &sizes, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing) { reinit (sizes); @@ -2266,8 +2266,8 @@ namespace internal { namespace Table { - template - void fill_Fortran_style (ForwardIterator entries, + template + void fill_Fortran_style (InputIterator entries, TableBase<1,T> &table) { for (unsigned int i=0; i - void fill_Fortran_style (ForwardIterator entries, + template + void fill_Fortran_style (InputIterator entries, TableBase<2,T> &table) { for (unsigned int j=0; j - void fill_Fortran_style (ForwardIterator entries, + template + void fill_Fortran_style (InputIterator entries, TableBase<3,T> &table) { for (unsigned int k=0; k - void fill_Fortran_style (ForwardIterator, + template + void fill_Fortran_style (InputIterator, TableBase &) { Assert (false, ExcNotImplemented()); @@ -2307,10 +2307,10 @@ namespace internal template -template +template inline void -TableBase::fill (ForwardIterator entries, +TableBase::fill (InputIterator entries, const bool C_style_indexing) { Assert (n_elements() != 0, @@ -2455,10 +2455,10 @@ Table<1,T>::Table (const unsigned int size) template -template +template inline Table<1,T>::Table (const unsigned int size, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing) : TableBase<1,T> (TableIndices<1> (size), @@ -2555,11 +2555,11 @@ Table<2,T>::Table (const unsigned int size1, template -template +template inline Table<2,T>::Table (const unsigned int size1, const unsigned int size2, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing) : TableBase<2,T> (TableIndices<2> (size1, size2), @@ -2824,12 +2824,12 @@ Table<3,T>::Table (const unsigned int size1, template -template +template inline Table<3,T>::Table (const unsigned int size1, const unsigned int size2, const unsigned int size3, - ForwardIterator entries, + InputIterator entries, const bool C_style_indexing) : TableBase<3,T> (TableIndices<3> (size1, size2, size3), -- 2.39.5