From: bangerth Date: Tue, 11 Sep 2012 13:11:08 +0000 (+0000) Subject: std::iterator has been in compilers for a long time, so remove the #ifdefs that provi... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6f81fa349178fe96c8649d31e13d96d52681c86;p=dealii-svn.git std::iterator has been in compilers for a long time, so remove the #ifdefs that provide alternate solutions. git-svn-id: https://svn.dealii.org/trunk@26280 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/grid/tria_iterator.h b/deal.II/include/deal.II/grid/tria_iterator.h index e24919e9a0..0c32918742 100644 --- a/deal.II/include/deal.II/grid/tria_iterator.h +++ b/deal.II/include/deal.II/grid/tria_iterator.h @@ -231,12 +231,7 @@ template class TriaActiveIterator; * @author documentation update Guido Kanschat, 2004 */ template -class TriaRawIterator : -#ifdef HAVE_STD_ITERATOR_CLASS - public std::iterator -#else - public bidirectional_iterator -#endif +class TriaRawIterator : public std::iterator { public: /** diff --git a/deal.II/include/deal.II/lac/block_vector_base.h b/deal.II/include/deal.II/lac/block_vector_base.h index dff90420e1..f5f3aaecbc 100644 --- a/deal.II/include/deal.II/lac/block_vector_base.h +++ b/deal.II/include/deal.II/lac/block_vector_base.h @@ -280,12 +280,8 @@ namespace internal */ template class Iterator : -#ifdef HAVE_STD_ITERATOR_CLASS public std::iterator::value_type> -#else - random_access_iterator::value_type,int> -#endif { private: /** @@ -799,7 +795,7 @@ class BlockVectorBase : public Subscriptor */ void compress (::dealii::VectorOperation::values operation =::dealii::VectorOperation::unknown); - + /** * Access to a single block.