Revert latest changes due to Sun Forte bug 6.

git-svn-id: https://svn.dealii.org/trunk@5588 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/include/lac/block_vector.h b/deal.II/lac/include/lac/block_vector.h
index c1268fb9e5190f35807da0e0b6d163237a7d56a5..30f591c40a67c5c6a8b31fe64ad3c148e24f25f7 100644 (file)
--- a/deal.II/lac/include/lac/block_vector.h
+++ b/deal.II/lac/include/lac/block_vector.h
@@ -563,13 +563,7 @@ namespace BlockVectorIterators
                                        */
       void move_backward ();
 
-                                      /**
-                                       * Make all other iterators
-                                       * friend, i.e. including the
-                                       * one with opposite constness.
-                                       */
-      template <class N, bool B>
-      friend class Iterator<N,B>;
+      friend class InverseConstnessIterator;
   };
 };
 
@@ -1132,11 +1126,11 @@ class BlockVector
     unsigned int num_blocks;
 
                                     /**
-                                     * Make the iterator classes
-                                     * friends.
+                                     * Make the iterator class a
+                                     * friend.
                                      */
-    template <typename T1, bool B>
-    friend class BlockVectorIterators::Iterator<T1,B>;
+    friend class iterator;
+    friend class const_iterator;
 
     template <typename Number2> friend class BlockVector;
 };