1.1 --- a/lemon/counter.h	Mon Mar 31 10:06:47 2008 +0100
     1.2 +++ b/lemon/counter.h	Sat Apr 12 19:41:48 2008 +0100
     1.3 @@ -29,7 +29,7 @@
     1.4  namespace lemon 
     1.5  {
     1.6  
     1.7 -  template<class P> class _SubNoCounter;
     1.8 +  template<class P> class _NoSubCounter;
     1.9  
    1.10    template<class P>
    1.11    class _SubCounter 
    1.12 @@ -41,7 +41,7 @@
    1.13    public:
    1.14  
    1.15      typedef _SubCounter<_SubCounter<P> > SubCounter;
    1.16 -    typedef _SubNoCounter<_SubCounter<P> > SubNoCounter;
    1.17 +    typedef _NoSubCounter<_SubCounter<P> > NoSubCounter;
    1.18  
    1.19      _SubCounter(P &parent)
    1.20        : _parent(parent), _title(), _os(std::cerr), count(0) {}
    1.21 @@ -64,29 +64,29 @@
    1.22    };
    1.23  
    1.24    template<class P>
    1.25 -  class _SubNoCounter 
    1.26 +  class _NoSubCounter 
    1.27    {
    1.28      P &_parent;
    1.29    public:
    1.30 -    typedef _SubNoCounter<_SubNoCounter<P> > SubCounter;
    1.31 -    typedef _SubNoCounter<_SubNoCounter<P> > SubNoCounter;
    1.32 +    typedef _NoSubCounter<_NoSubCounter<P> > SubCounter;
    1.33 +    typedef _NoSubCounter<_NoSubCounter<P> > NoSubCounter;
    1.34    
    1.35 -    _SubNoCounter(P &parent) :_parent(parent) {}
    1.36 -    _SubNoCounter(P &parent,std::string,std::ostream &) 
    1.37 +    _NoSubCounter(P &parent) :_parent(parent) {}
    1.38 +    _NoSubCounter(P &parent,std::string,std::ostream &) 
    1.39        :_parent(parent) {}
    1.40 -    _SubNoCounter(P &parent,std::string) 
    1.41 +    _NoSubCounter(P &parent,std::string) 
    1.42        :_parent(parent) {}
    1.43 -    _SubNoCounter(P &parent,const char *,std::ostream &)
    1.44 +    _NoSubCounter(P &parent,const char *,std::ostream &)
    1.45        :_parent(parent) {}
    1.46 -    _SubNoCounter(P &parent,const char *)
    1.47 +    _NoSubCounter(P &parent,const char *)
    1.48        :_parent(parent) {}
    1.49 -    ~_SubNoCounter() {}
    1.50 -    _SubNoCounter &operator++() { ++_parent; return *this;}
    1.51 +    ~_NoSubCounter() {}
    1.52 +    _NoSubCounter &operator++() { ++_parent; return *this;}
    1.53      int operator++(int) { _parent++; return 0;}
    1.54 -    _SubNoCounter &operator--() { --_parent; return *this;}
    1.55 +    _NoSubCounter &operator--() { --_parent; return *this;}
    1.56      int operator--(int) { _parent--; return 0;}
    1.57 -    _SubNoCounter &operator+=(int c) { _parent+=c; return *this;}
    1.58 -    _SubNoCounter &operator-=(int c) { _parent-=c; return *this;}
    1.59 +    _NoSubCounter &operator+=(int c) { _parent+=c; return *this;}
    1.60 +    _NoSubCounter &operator-=(int c) { _parent-=c; return *this;}
    1.61      void reset(int) {}
    1.62      void reset() {}
    1.63      operator int() {return 0;}
    1.64 @@ -117,7 +117,7 @@
    1.65  
    1.66      ///\todo document please.
    1.67      ///
    1.68 -    typedef _SubNoCounter<Counter> SubNoCounter;
    1.69 +    typedef _NoSubCounter<Counter> NoSubCounter;
    1.70  
    1.71      ///\e
    1.72      Counter() : _title(), _os(std::cerr), count(0) {}
    1.73 @@ -156,8 +156,8 @@
    1.74    class NoCounter
    1.75    {
    1.76    public:
    1.77 -    typedef _SubNoCounter<NoCounter> SubCounter;
    1.78 -    typedef _SubNoCounter<NoCounter> SubNoCounter;
    1.79 +    typedef _NoSubCounter<NoCounter> SubCounter;
    1.80 +    typedef _NoSubCounter<NoCounter> NoSubCounter;
    1.81  
    1.82      NoCounter() {}
    1.83      NoCounter(std::string,std::ostream &) {}