[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/e7af73f1805e
changeset: 292:e7af73f1805e
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Oct 01 12:26:45 2008 +0200
description:
	Merge

diffstat:

3 files changed, 10 insertions(+), 10 deletions(-)
lemon/bfs.h                |    2 +-
lemon/bits/base_extender.h |   16 ++++++++--------
lemon/dfs.h                |    2 +-

diffs (61 lines):

diff -r d901321d6555 -r e7af73f1805e lemon/bfs.h
--- a/lemon/bfs.h	Wed Oct 01 11:58:03 2008 +0200
+++ b/lemon/bfs.h	Wed Oct 01 12:26:45 2008 +0200
@@ -1312,7 +1312,7 @@
 #else
   template <typename _Digraph = ListDigraph,
             typename _Visitor = BfsVisitor<_Digraph>,
-            typename _Traits = BfsDefaultTraits<_Digraph> >
+            typename _Traits = BfsVisitDefaultTraits<_Digraph> >
 #endif
   class BfsVisit {
   public:
diff -r d901321d6555 -r e7af73f1805e lemon/bits/base_extender.h
--- a/lemon/bits/base_extender.h	Wed Oct 01 11:58:03 2008 +0200
+++ b/lemon/bits/base_extender.h	Wed Oct 01 12:26:45 2008 +0200
@@ -298,12 +298,12 @@
     public:
       Red() {}
       Red(const Node& node) : Node(node) {
-        LEMON_ASSERT(Parent::red(node) || node == INVALID,
-                     typename Parent::NodeSetError());
+        LEMON_DEBUG(Parent::red(node) || node == INVALID,
+                    typename Parent::NodeSetError());
       }
       Red& operator=(const Node& node) {
-        LEMON_ASSERT(Parent::red(node) || node == INVALID,
-                     typename Parent::NodeSetError());
+        LEMON_DEBUG(Parent::red(node) || node == INVALID,
+                    typename Parent::NodeSetError());
         Node::operator=(node);
         return *this;
       }
@@ -330,12 +330,12 @@
     public:
       Blue() {}
       Blue(const Node& node) : Node(node) {
-        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
-                     typename Parent::NodeSetError());
+        LEMON_DEBUG(Parent::blue(node) || node == INVALID,
+                    typename Parent::NodeSetError());
       }
       Blue& operator=(const Node& node) {
-        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
-                     typename Parent::NodeSetError());
+        LEMON_DEBUG(Parent::blue(node) || node == INVALID,
+                    typename Parent::NodeSetError());
         Node::operator=(node);
         return *this;
       }
diff -r d901321d6555 -r e7af73f1805e lemon/dfs.h
--- a/lemon/dfs.h	Wed Oct 01 11:58:03 2008 +0200
+++ b/lemon/dfs.h	Wed Oct 01 12:26:45 2008 +0200
@@ -1258,7 +1258,7 @@
 #else
   template <typename _Digraph = ListDigraph,
             typename _Visitor = DfsVisitor<_Digraph>,
-            typename _Traits = DfsDefaultTraits<_Digraph> >
+            typename _Traits = DfsVisitDefaultTraits<_Digraph> >
 #endif
   class DfsVisit {
   public: