removed unnecessary friend declarations.

[[Imported from SVN: r211]]

istl/remoteindices.hh

@@ -288,18 +288,6 @@ namespace Dune {
 
   template<class TG, class TA, int N>
   class IndicesSyncer;
-}
-
-template<typename TG, typename TA, int N>
-void deleteOverlapEntries(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>& indices,
-                          Dune::RemoteIndices<TG,TA,N>& remoteIndices);
-template<typename TG, typename TA, int N>
-void addFakeRemoteIndices(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>&,
-                          Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>&,
-                          Dune::RemoteIndices<TG,TA,N>&,
-                          Dune::RemoteIndices<TG,TA,N>&);
-namespace Dune
-{
 
   /**
    * @brief The indices present on remote processes.
@@ -314,12 +302,6 @@ namespace Dune
     friend void repairLocalIndexPointers(std::map<int,SLList<T1,A> >&, RemoteIndices<T1,T2,M>&,
                                          const IndexSet<T1,ParallelLocalIndex<T2>,M>&);
     friend std::ostream& operator<<<>(std::ostream&, const RemoteIndices<TG,TA,N>&);
-    friend void deleteOverlapEntries<>(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>&,
-                                       Dune::RemoteIndices<TG,TA,N>&);
-    friend void addFakeRemoteIndices<>(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>&,
-                                       Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>&,
-                                       Dune::RemoteIndices<TG,TA,N>&,
-                                       Dune::RemoteIndices<TG,TA,N>&);
 
   public:
     /**
@@ -422,13 +404,13 @@ namespace Dune
      * @brief Get an iterator over all remote index lists.
      * @return The iterator over all remote index lists postioned at the first process.
      */
-    inline typename RemoteIndexMap::const_iterator begin() const;
+    inline const_iterator begin() const;
 
     /**
      * @brief Get an iterator over all remote index lists.
      * @return The iterator over all remote index lists postioned at the end.
      */
-    inline typename RemoteIndexMap::const_iterator end() const;
+    inline const_iterator end() const;
 
     /**
      * @brief Get an iterator for colletively iterating over the remote indices of all remote processes.

istl/test/syncertest.cc

@@ -21,7 +21,7 @@ void deleteOverlapEntries(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>& ind
   typedef typename GlobalList::ModifyIterator GlobalModifier;
   typedef Dune::Tuple<RemoteModifier,GlobalModifier,const RemoteIterator> IteratorTuple;
   typedef std::map<int,IteratorTuple> IteratorMap;
-  typedef typename RemoteIndices::RemoteIndexMap::iterator RemoteMapIterator;
+  typedef typename RemoteIndices::const_iterator RemoteMapIterator;
 
   int rank;
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -29,9 +29,9 @@ void deleteOverlapEntries(Dune::IndexSet<TG,Dune::ParallelLocalIndex<TA>,N>& ind
   std::map<int,GlobalList> globalLists;
 
   IteratorMap iterators;
-  RemoteMapIterator rmEnd = remoteIndices.remoteIndices_.end();
+  RemoteMapIterator rmEnd = remoteIndices.end();
 
-  for(RemoteMapIterator remote = remoteIndices.remoteIndices_.begin();
+  for(RemoteMapIterator remote = remoteIndices.begin();
       remote != rmEnd; ++remote) {
     // Initialize global indices
     GlobalList& gList=globalLists[remote->first];