Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 01 Oct 2008 12:26:45 +0200
changeset 292e7af73f1805e
parent 291 d901321d6555
parent 289 d91884dcd572
child 294 cbe3ec2d59d2
Merge
lemon/bfs.h
lemon/dfs.h
     1.1 --- a/lemon/bfs.h	Wed Oct 01 11:58:03 2008 +0200
     1.2 +++ b/lemon/bfs.h	Wed Oct 01 12:26:45 2008 +0200
     1.3 @@ -1312,7 +1312,7 @@
     1.4  #else
     1.5    template <typename _Digraph = ListDigraph,
     1.6              typename _Visitor = BfsVisitor<_Digraph>,
     1.7 -            typename _Traits = BfsDefaultTraits<_Digraph> >
     1.8 +            typename _Traits = BfsVisitDefaultTraits<_Digraph> >
     1.9  #endif
    1.10    class BfsVisit {
    1.11    public:
     2.1 --- a/lemon/bits/base_extender.h	Wed Oct 01 11:58:03 2008 +0200
     2.2 +++ b/lemon/bits/base_extender.h	Wed Oct 01 12:26:45 2008 +0200
     2.3 @@ -298,12 +298,12 @@
     2.4      public:
     2.5        Red() {}
     2.6        Red(const Node& node) : Node(node) {
     2.7 -        LEMON_ASSERT(Parent::red(node) || node == INVALID,
     2.8 -                     typename Parent::NodeSetError());
     2.9 +        LEMON_DEBUG(Parent::red(node) || node == INVALID,
    2.10 +                    typename Parent::NodeSetError());
    2.11        }
    2.12        Red& operator=(const Node& node) {
    2.13 -        LEMON_ASSERT(Parent::red(node) || node == INVALID,
    2.14 -                     typename Parent::NodeSetError());
    2.15 +        LEMON_DEBUG(Parent::red(node) || node == INVALID,
    2.16 +                    typename Parent::NodeSetError());
    2.17          Node::operator=(node);
    2.18          return *this;
    2.19        }
    2.20 @@ -330,12 +330,12 @@
    2.21      public:
    2.22        Blue() {}
    2.23        Blue(const Node& node) : Node(node) {
    2.24 -        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
    2.25 -                     typename Parent::NodeSetError());
    2.26 +        LEMON_DEBUG(Parent::blue(node) || node == INVALID,
    2.27 +                    typename Parent::NodeSetError());
    2.28        }
    2.29        Blue& operator=(const Node& node) {
    2.30 -        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
    2.31 -                     typename Parent::NodeSetError());
    2.32 +        LEMON_DEBUG(Parent::blue(node) || node == INVALID,
    2.33 +                    typename Parent::NodeSetError());
    2.34          Node::operator=(node);
    2.35          return *this;
    2.36        }
     3.1 --- a/lemon/dfs.h	Wed Oct 01 11:58:03 2008 +0200
     3.2 +++ b/lemon/dfs.h	Wed Oct 01 12:26:45 2008 +0200
     3.3 @@ -1258,7 +1258,7 @@
     3.4  #else
     3.5    template <typename _Digraph = ListDigraph,
     3.6              typename _Visitor = DfsVisitor<_Digraph>,
     3.7 -            typename _Traits = DfsDefaultTraits<_Digraph> >
     3.8 +            typename _Traits = DfsVisitDefaultTraits<_Digraph> >
     3.9  #endif
    3.10    class DfsVisit {
    3.11    public: