Eliminate warnins
authoralpar
Wed, 07 Dec 2005 15:43:44 +0000
changeset 1855c72636dcf0bd
parent 1854 a68d4f93b1fb
child 1856 3f0558065bcd
Eliminate warnins
benchmark/graph-bench.cc
lemon/counter.h
lemon/lp_skeleton.cc
lemon/time_measure.h
     1.1 --- a/benchmark/graph-bench.cc	Wed Dec 07 15:40:27 2005 +0000
     1.2 +++ b/benchmark/graph-bench.cc	Wed Dec 07 15:43:44 2005 +0000
     1.3 @@ -28,12 +28,14 @@
     1.4    long long int count;
     1.5    
     1.6    for(count=0;count<rat;count++) {
     1.7 -    equ[count%rat]=G.addEdge(nodes[(count*p)%n],nodes[(count*p/n)%n]);
     1.8 +    equ[int(count%rat)]=G.addEdge(nodes[int((count*p)%n)],
     1.9 +				  nodes[int((count*p/n)%n)]);
    1.10    }
    1.11    for(;(count%rat)||((count*p)%n)||((count*p/n)%n);count++) {
    1.12      //    if(!(count%1000000)) fprintf(stderr,"%d\r",count);
    1.13      if(count%rat) G.erase(equ[count%rat]);
    1.14 -    equ[count%rat]=G.addEdge(nodes[(count*p)%n],nodes[(count*p/n)%n]);
    1.15 +    equ[int(count%rat)]=G.addEdge(nodes[int((count*p)%n)],
    1.16 +				  nodes[int((count*p/n)%n)]);
    1.17    }
    1.18  //   std::cout << "Added " << count
    1.19  // 	    << " ( " << n << "^2 * " << rat << " ) edges\n";
     2.1 --- a/lemon/counter.h	Wed Dec 07 15:40:27 2005 +0000
     2.2 +++ b/lemon/counter.h	Wed Dec 07 15:43:44 2005 +0000
     2.3 @@ -71,9 +71,13 @@
     2.4      typedef _SubNoCounter<_SubNoCounter<P> > SubNoCounter;
     2.5    
     2.6      _SubNoCounter(P &parent) :_parent(parent) {}
     2.7 -    _SubNoCounter(P &parent,std::string title,std::ostream &os=std::cerr) 
     2.8 +    _SubNoCounter(P &parent,std::string,std::ostream &) 
     2.9        :_parent(parent) {}
    2.10 -    _SubNoCounter(P &parent,const char *title,std::ostream &os=std::cerr)
    2.11 +    _SubNoCounter(P &parent,std::string) 
    2.12 +      :_parent(parent) {}
    2.13 +    _SubNoCounter(P &parent,const char *,std::ostream &)
    2.14 +      :_parent(parent) {}
    2.15 +    _SubNoCounter(P &parent,const char *)
    2.16        :_parent(parent) {}
    2.17      ~_SubNoCounter() {}
    2.18      _SubNoCounter &operator++() { ++_parent; return *this;}
    2.19 @@ -82,7 +86,8 @@
    2.20      int operator--(int) { _parent--; return 0;}
    2.21      _SubNoCounter &operator+=(int c) { _parent+=c; return *this;}
    2.22      _SubNoCounter &operator-=(int c) { _parent-=c; return *this;}
    2.23 -    void reset(int c=0) {}
    2.24 +    void reset(int) {}
    2.25 +    void reset() {}
    2.26      operator int() {return 0;}
    2.27    };
    2.28  
    2.29 @@ -154,15 +159,18 @@
    2.30      typedef _SubNoCounter<NoCounter> SubNoCounter;
    2.31  
    2.32      NoCounter() {}
    2.33 -    NoCounter(std::string title,std::ostream &os=std::cerr) {}
    2.34 -    NoCounter(const char *title,std::ostream &os=std::cerr) {}
    2.35 +    NoCounter(std::string,std::ostream &) {}
    2.36 +    NoCounter(const char *,std::ostream &) {}
    2.37 +    NoCounter(std::string) {}
    2.38 +    NoCounter(const char *) {}
    2.39      NoCounter &operator++() { return *this; }
    2.40      int operator++(int) { return 0; }
    2.41      NoCounter &operator--() { return *this; }
    2.42      int operator--(int) { return 0; }
    2.43 -    NoCounter &operator+=(int c) { return *this;}
    2.44 -    NoCounter &operator-=(int c) { return *this;}
    2.45 -    void reset(int c=0) {}
    2.46 +    NoCounter &operator+=(int) { return *this;}
    2.47 +    NoCounter &operator-=(int) { return *this;}
    2.48 +    void reset(int) {}
    2.49 +    void reset() {}
    2.50      operator int() {return 0;}
    2.51    };
    2.52  
     3.1 --- a/lemon/lp_skeleton.cc	Wed Dec 07 15:40:27 2005 +0000
     3.2 +++ b/lemon/lp_skeleton.cc	Wed Dec 07 15:43:44 2005 +0000
     3.3 @@ -138,7 +138,7 @@
     3.4      return UNKNOWN;
     3.5    }
     3.6  
     3.7 -  bool LpSkeleton::_isBasicCol(int i)
     3.8 +  bool LpSkeleton::_isBasicCol(int)
     3.9    {
    3.10      return true;
    3.11    }
     4.1 --- a/lemon/time_measure.h	Wed Dec 07 15:40:27 2005 +0000
     4.2 +++ b/lemon/time_measure.h	Wed Dec 07 15:43:44 2005 +0000
     4.3 @@ -470,7 +470,11 @@
     4.4    {
     4.5    public:
     4.6      ///\e
     4.7 -    NoTimeReport(std::string title,std::ostream &os=std::cerr,bool run=true) {}
     4.8 +    NoTimeReport(std::string,std::ostream &,bool) {}
     4.9 +    ///\e
    4.10 +    NoTimeReport(std::string,std::ostream &) {}
    4.11 +    ///\e
    4.12 +    NoTimeReport(std::string) {}
    4.13      ///\e Do nothing.
    4.14      ~NoTimeReport() {}
    4.15