# HG changeset patch # User Alpar Juttner <alpar@cs.elte.hu> # Date 1208025708 -3600 # Node ID 91c0fed3181e507d1b514c769802832bfd991ecd # Parent 137278093143556e8f046f963a4809f1f21904f3 Change SubNoCounter to NoSubCounter diff -r 137278093143 -r 91c0fed3181e lemon/counter.h --- a/lemon/counter.h Mon Mar 31 10:06:47 2008 +0100 +++ b/lemon/counter.h Sat Apr 12 19:41:48 2008 +0100 @@ -29,7 +29,7 @@ namespace lemon { - template<class P> class _SubNoCounter; + template<class P> class _NoSubCounter; template<class P> class _SubCounter @@ -41,7 +41,7 @@ public: typedef _SubCounter<_SubCounter<P> > SubCounter; - typedef _SubNoCounter<_SubCounter<P> > SubNoCounter; + typedef _NoSubCounter<_SubCounter<P> > NoSubCounter; _SubCounter(P &parent) : _parent(parent), _title(), _os(std::cerr), count(0) {} @@ -64,29 +64,29 @@ }; template<class P> - class _SubNoCounter + class _NoSubCounter { P &_parent; public: - typedef _SubNoCounter<_SubNoCounter<P> > SubCounter; - typedef _SubNoCounter<_SubNoCounter<P> > SubNoCounter; + typedef _NoSubCounter<_NoSubCounter<P> > SubCounter; + typedef _NoSubCounter<_NoSubCounter<P> > NoSubCounter; - _SubNoCounter(P &parent) :_parent(parent) {} - _SubNoCounter(P &parent,std::string,std::ostream &) + _NoSubCounter(P &parent) :_parent(parent) {} + _NoSubCounter(P &parent,std::string,std::ostream &) :_parent(parent) {} - _SubNoCounter(P &parent,std::string) + _NoSubCounter(P &parent,std::string) :_parent(parent) {} - _SubNoCounter(P &parent,const char *,std::ostream &) + _NoSubCounter(P &parent,const char *,std::ostream &) :_parent(parent) {} - _SubNoCounter(P &parent,const char *) + _NoSubCounter(P &parent,const char *) :_parent(parent) {} - ~_SubNoCounter() {} - _SubNoCounter &operator++() { ++_parent; return *this;} + ~_NoSubCounter() {} + _NoSubCounter &operator++() { ++_parent; return *this;} int operator++(int) { _parent++; return 0;} - _SubNoCounter &operator--() { --_parent; return *this;} + _NoSubCounter &operator--() { --_parent; return *this;} int operator--(int) { _parent--; return 0;} - _SubNoCounter &operator+=(int c) { _parent+=c; return *this;} - _SubNoCounter &operator-=(int c) { _parent-=c; return *this;} + _NoSubCounter &operator+=(int c) { _parent+=c; return *this;} + _NoSubCounter &operator-=(int c) { _parent-=c; return *this;} void reset(int) {} void reset() {} operator int() {return 0;} @@ -117,7 +117,7 @@ ///\todo document please. /// - typedef _SubNoCounter<Counter> SubNoCounter; + typedef _NoSubCounter<Counter> NoSubCounter; ///\e Counter() : _title(), _os(std::cerr), count(0) {} @@ -156,8 +156,8 @@ class NoCounter { public: - typedef _SubNoCounter<NoCounter> SubCounter; - typedef _SubNoCounter<NoCounter> SubNoCounter; + typedef _NoSubCounter<NoCounter> SubCounter; + typedef _NoSubCounter<NoCounter> NoSubCounter; NoCounter() {} NoCounter(std::string,std::ostream &) {}