Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/dijkstra.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3217

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

• lemon/dijkstra.h (modified) (6 diffs)

lemon/dijkstra.h

@@ -488 +488 @@
     ///automatically allocated heap and cross reference, of course.
     ///\return <tt> (*this) </tt>
-    Dijkstra &heap(Heap& heap, HeapCrossRef &crossRef)
+    Dijkstra &heap(Heap& hp, HeapCrossRef &cr)
     {
       if(local_heap_cross_ref) {
@@ -494 +494 @@
         local_heap_cross_ref=false;
       }
-      _heap_cross_ref = &crossRef;
+      _heap_cross_ref = &cr;
       if(local_heap) {
         delete _heap;
         local_heap=false;
       }
-      _heap = &heap;
+      _heap = &hp;
       return *this;
     }
@@ -963 +963 @@
     /// \param s is the initial value of  \ref _source
     DijkstraWizardBase(const GR &g,const LM &l, Node s=INVALID) :
-      _g((void *)&g), _length((void *)&l), _pred(0),
-      _dist(0), _source(s) {}
+      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))), 
+      _length(reinterpret_cast<void*>(const_cast<LM*>(&l))), 
+      _pred(0), _dist(0), _source(s) {}
 
   };
@@ -1038 +1039 @@
       if(Base::_source==INVALID) throw UninitializedParameter();
       Dijkstra<Graph,LengthMap,TR> 
-        dij(*(Graph*)Base::_g,*(LengthMap*)Base::_length);
-      if(Base::_pred) dij.predMap(*(PredMap*)Base::_pred);
-      if(Base::_dist) dij.distMap(*(DistMap*)Base::_dist);
+        dij(*reinterpret_cast<const Graph*>(Base::_g),
+            *reinterpret_cast<const LengthMap*>(Base::_length));
+      if(Base::_pred) dij.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
+      if(Base::_dist) dij.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
       dij.run(Base::_source);
     }
@@ -1070 +1072 @@
     DijkstraWizard<DefPredMapBase<T> > predMap(const T &t) 
     {
-      Base::_pred=(void *)&t;
+      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DijkstraWizard<DefPredMapBase<T> >(*this);
     }
@@ -1090 +1092 @@
     DijkstraWizard<DefDistMapBase<T> > distMap(const T &t) 
     {
-      Base::_dist=(void *)&t;
+      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DijkstraWizard<DefDistMapBase<T> >(*this);
     }