Merge from trunk 1.0
authorAlpar Juttner <alpar@cs.elte.hu>
Fri, 10 Oct 2008 13:44:10 +0100
branch1.0
changeset 3318ea420d5df75
parent 330 d3a7603026a2
parent 319 5e12d7734036
child 332 b802094f96fd
Merge from trunk
     1.1 --- a/lemon/core.h	Fri Oct 10 10:52:08 2008 +0100
     1.2 +++ b/lemon/core.h	Fri Oct 10 13:44:10 2008 +0100
     1.3 @@ -24,6 +24,7 @@
     1.4  
     1.5  #include <lemon/bits/enable_if.h>
     1.6  #include <lemon/bits/traits.h>
     1.7 +#include <lemon/assert.h>
     1.8  
     1.9  ///\file
    1.10  ///\brief LEMON core utilities.
     2.1 --- a/lemon/dfs.h	Fri Oct 10 10:52:08 2008 +0100
     2.2 +++ b/lemon/dfs.h	Fri Oct 10 13:44:10 2008 +0100
     2.3 @@ -27,7 +27,6 @@
     2.4  #include <lemon/bits/path_dump.h>
     2.5  #include <lemon/core.h>
     2.6  #include <lemon/error.h>
     2.7 -#include <lemon/assert.h>
     2.8  #include <lemon/maps.h>
     2.9  #include <lemon/path.h>
    2.10  
     3.1 --- a/lemon/lgf_reader.h	Fri Oct 10 10:52:08 2008 +0100
     3.2 +++ b/lemon/lgf_reader.h	Fri Oct 10 13:44:10 2008 +0100
     3.3 @@ -31,7 +31,6 @@
     3.4  #include <set>
     3.5  #include <map>
     3.6  
     3.7 -#include <lemon/assert.h>
     3.8  #include <lemon/core.h>
     3.9  
    3.10  #include <lemon/lgf_writer.h>
     4.1 --- a/lemon/lgf_writer.h	Fri Oct 10 10:52:08 2008 +0100
     4.2 +++ b/lemon/lgf_writer.h	Fri Oct 10 13:44:10 2008 +0100
     4.3 @@ -33,7 +33,6 @@
     4.4  #include <vector>
     4.5  #include <functional>
     4.6  
     4.7 -#include <lemon/assert.h>
     4.8  #include <lemon/core.h>
     4.9  #include <lemon/maps.h>
    4.10