[Lemon-commits] [lemon_svn] alpar: r2423 - in hugo/trunk: benchmark lemon

[Lemon SVN]

Author: alpar
Date: Wed Dec  7 16:43:44 2005
New Revision: 2423

Modified:
   hugo/trunk/benchmark/graph-bench.cc
   hugo/trunk/lemon/counter.h
   hugo/trunk/lemon/lp_skeleton.cc
   hugo/trunk/lemon/time_measure.h

Log:
Eliminate warnins


Modified: hugo/trunk/benchmark/graph-bench.cc
==============================================================================
--- hugo/trunk/benchmark/graph-bench.cc	(original)
+++ hugo/trunk/benchmark/graph-bench.cc	Wed Dec  7 16:43:44 2005
@@ -28,12 +28,14 @@
   long long int count;
   
   for(count=0;count<rat;count++) {
-    equ[count%rat]=G.addEdge(nodes[(count*p)%n],nodes[(count*p/n)%n]);
+    equ[int(count%rat)]=G.addEdge(nodes[int((count*p)%n)],
+				  nodes[int((count*p/n)%n)]);
   }
   for(;(count%rat)||((count*p)%n)||((count*p/n)%n);count++) {
     //    if(!(count%1000000)) fprintf(stderr,"%d\r",count);
     if(count%rat) G.erase(equ[count%rat]);
-    equ[count%rat]=G.addEdge(nodes[(count*p)%n],nodes[(count*p/n)%n]);
+    equ[int(count%rat)]=G.addEdge(nodes[int((count*p)%n)],
+				  nodes[int((count*p/n)%n)]);
   }
 //   std::cout << "Added " << count
 // 	    << " ( " << n << "^2 * " << rat << " ) edges\n";

Modified: hugo/trunk/lemon/counter.h
==============================================================================
--- hugo/trunk/lemon/counter.h	(original)
+++ hugo/trunk/lemon/counter.h	Wed Dec  7 16:43:44 2005
@@ -71,9 +71,13 @@
     typedef _SubNoCounter<_SubNoCounter<P> > SubNoCounter;
   
     _SubNoCounter(P &parent) :_parent(parent) {}
-    _SubNoCounter(P &parent,std::string title,std::ostream &os=std::cerr) 
+    _SubNoCounter(P &parent,std::string,std::ostream &) 
       :_parent(parent) {}
-    _SubNoCounter(P &parent,const char *title,std::ostream &os=std::cerr)
+    _SubNoCounter(P &parent,std::string) 
+      :_parent(parent) {}
+    _SubNoCounter(P &parent,const char *,std::ostream &)
+      :_parent(parent) {}
+    _SubNoCounter(P &parent,const char *)
       :_parent(parent) {}
     ~_SubNoCounter() {}
     _SubNoCounter &operator++() { ++_parent; return *this;}
@@ -82,7 +86,8 @@
     int operator--(int) { _parent--; return 0;}
     _SubNoCounter &operator+=(int c) { _parent+=c; return *this;}
     _SubNoCounter &operator-=(int c) { _parent-=c; return *this;}
-    void reset(int c=0) {}
+    void reset(int) {}
+    void reset() {}
     operator int() {return 0;}
   };
 
@@ -154,15 +159,18 @@
     typedef _SubNoCounter<NoCounter> SubNoCounter;
 
     NoCounter() {}
-    NoCounter(std::string title,std::ostream &os=std::cerr) {}
-    NoCounter(const char *title,std::ostream &os=std::cerr) {}
+    NoCounter(std::string,std::ostream &) {}
+    NoCounter(const char *,std::ostream &) {}
+    NoCounter(std::string) {}
+    NoCounter(const char *) {}
     NoCounter &operator++() { return *this; }
     int operator++(int) { return 0; }
     NoCounter &operator--() { return *this; }
     int operator--(int) { return 0; }
-    NoCounter &operator+=(int c) { return *this;}
-    NoCounter &operator-=(int c) { return *this;}
-    void reset(int c=0) {}
+    NoCounter &operator+=(int) { return *this;}
+    NoCounter &operator-=(int) { return *this;}
+    void reset(int) {}
+    void reset() {}
     operator int() {return 0;}
   };
 

Modified: hugo/trunk/lemon/lp_skeleton.cc
==============================================================================
--- hugo/trunk/lemon/lp_skeleton.cc	(original)
+++ hugo/trunk/lemon/lp_skeleton.cc	Wed Dec  7 16:43:44 2005
@@ -138,7 +138,7 @@
     return UNKNOWN;
   }
 
-  bool LpSkeleton::_isBasicCol(int i)
+  bool LpSkeleton::_isBasicCol(int)
   {
     return true;
   }

Modified: hugo/trunk/lemon/time_measure.h
==============================================================================
--- hugo/trunk/lemon/time_measure.h	(original)
+++ hugo/trunk/lemon/time_measure.h	Wed Dec  7 16:43:44 2005
@@ -470,7 +470,11 @@
   {
   public:
     ///\e
-    NoTimeReport(std::string title,std::ostream &os=std::cerr,bool run=true) {}
+    NoTimeReport(std::string,std::ostream &,bool) {}
+    ///\e
+    NoTimeReport(std::string,std::ostream &) {}
+    ///\e
+    NoTimeReport(std::string) {}
     ///\e Do nothing.
     ~NoTimeReport() {}