Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/dfs.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/dfs.h (modified) (6 diffs)

lemon/dfs.h

@@ -859 +859 @@
     /// \param s is the initial value of  \ref _source
     DfsWizardBase(const GR &g, Node s=INVALID) :
-      _g((void *)&g), _reached(0), _processed(0), _pred(0),
-      _dist(0), _source(s) {}
+      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))), 
+      _reached(0), _processed(0), _pred(0), _dist(0), _source(s) {}
 
   };
@@ -934 +934 @@
     {
       if(Base::_source==INVALID) throw UninitializedParameter();
-      Dfs<Graph,TR> alg(*(Graph*)Base::_g);
-      if(Base::_reached) alg.reachedMap(*(ReachedMap*)Base::_reached);
-      if(Base::_processed) alg.processedMap(*(ProcessedMap*)Base::_processed);
-      if(Base::_pred) alg.predMap(*(PredMap*)Base::_pred);
-      if(Base::_dist) alg.distMap(*(DistMap*)Base::_dist);
+      Dfs<Graph,TR> alg(*reinterpret_cast<const Graph*>(Base::_g));
+      if(Base::_reached) 
+        alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
+      if(Base::_processed) 
+        alg.processedMap(*reinterpret_cast<ProcessedMap*>(Base::_processed));
+      if(Base::_pred) 
+        alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
+      if(Base::_dist) 
+        alg.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
       alg.run(Base::_source);
     }
@@ -968 +972 @@
     DfsWizard<DefPredMapBase<T> > predMap(const T &t) 
     {
-      Base::_pred=(void *)&t;
+      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefPredMapBase<T> >(*this);
     }
@@ -989 +993 @@
     DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t) 
     {
-      Base::_pred=(void *)&t;
+      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefReachedMapBase<T> >(*this);
     }
@@ -1010 +1014 @@
     DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t) 
     {
-      Base::_pred=(void *)&t;
+      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefProcessedMapBase<T> >(*this);
     }
@@ -1030 +1034 @@
     DfsWizard<DefDistMapBase<T> > distMap(const T &t) 
     {
-      Base::_dist=(void *)&t;
+      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefDistMapBase<T> >(*this);
     }