]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
std::iterator has been in compilers for a long time, so remove the #ifdefs that provi...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 11 Sep 2012 13:11:08 +0000 (13:11 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 11 Sep 2012 13:11:08 +0000 (13:11 +0000)
git-svn-id: https://svn.dealii.org/trunk@26280 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/grid/tria_iterator.h
deal.II/include/deal.II/lac/block_vector_base.h

index e24919e9a0d3277453d9e3e24ea1ede8ce5b5cba..0c32918742a7d34f14f2707cfe23b044013ddfec 100644 (file)
@@ -231,12 +231,7 @@ template <typename> class TriaActiveIterator;
  * @author documentation update Guido Kanschat, 2004
  */
 template <typename Accessor>
-class TriaRawIterator :
-#ifdef HAVE_STD_ITERATOR_CLASS
-               public std::iterator<std::bidirectional_iterator_tag,Accessor>
-#else
-               public bidirectional_iterator<Accessor,int>
-#endif
+class TriaRawIterator : public std::iterator<std::bidirectional_iterator_tag,Accessor>
 {
   public:
                                      /**
index dff90420e117fc48ec8a702166fb8f6a196b3a12..f5f3aaecbc4cc6a279bbfa24f1f2984bdecf7d58 100644 (file)
@@ -280,12 +280,8 @@ namespace internal
                                       */
     template <class BlockVectorType, bool constness>
     class Iterator :
-#ifdef HAVE_STD_ITERATOR_CLASS
         public std::iterator<std::random_access_iterator_tag,
                              typename Types<BlockVectorType,constness>::value_type>
-#else
-    random_access_iterator<typename Types<BlockVectorType,constness>::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.

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.