Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 23 Feb 2009 12:33:40 +0000
changeset 5301c5d6e47921f
parent 528 88bd39ef7d98
parent 529 f5bc148f7e1f
child 531 ba7bafdc458d
child 532 997a75bac45a
Merge
     1.1 --- a/lemon/bits/path_dump.h	Mon Feb 23 12:26:21 2009 +0000
     1.2 +++ b/lemon/bits/path_dump.h	Mon Feb 23 12:33:40 2009 +0000
     1.3 @@ -16,8 +16,8 @@
     1.4   *
     1.5   */
     1.6  
     1.7 -#ifndef LEMON_BITS_PRED_MAP_PATH_H
     1.8 -#define LEMON_BITS_PRED_MAP_PATH_H
     1.9 +#ifndef LEMON_BITS_PATH_DUMP_H
    1.10 +#define LEMON_BITS_PATH_DUMP_H
    1.11  
    1.12  #include <lemon/core.h>
    1.13  #include <lemon/concept_check.h>
     2.1 --- a/lemon/bits/windows.h	Mon Feb 23 12:26:21 2009 +0000
     2.2 +++ b/lemon/bits/windows.h	Mon Feb 23 12:33:40 2009 +0000
     2.3 @@ -16,8 +16,8 @@
     2.4   *
     2.5   */
     2.6  
     2.7 -#ifndef LEMON_WINDOWS_H
     2.8 -#define LEMON_WINDOWS_H
     2.9 +#ifndef LEMON_BITS_WINDOWS_H
    2.10 +#define LEMON_BITS_WINDOWS_H
    2.11  
    2.12  #include <string>
    2.13  
     3.1 --- a/lemon/concepts/digraph.h	Mon Feb 23 12:26:21 2009 +0000
     3.2 +++ b/lemon/concepts/digraph.h	Mon Feb 23 12:33:40 2009 +0000
     3.3 @@ -16,8 +16,8 @@
     3.4   *
     3.5   */
     3.6  
     3.7 -#ifndef LEMON_CONCEPT_DIGRAPH_H
     3.8 -#define LEMON_CONCEPT_DIGRAPH_H
     3.9 +#ifndef LEMON_CONCEPTS_DIGRAPH_H
    3.10 +#define LEMON_CONCEPTS_DIGRAPH_H
    3.11  
    3.12  ///\ingroup graph_concepts
    3.13  ///\file
    3.14 @@ -484,4 +484,4 @@
    3.15  
    3.16  
    3.17  
    3.18 -#endif // LEMON_CONCEPT_DIGRAPH_H
    3.19 +#endif
     4.1 --- a/lemon/concepts/graph.h	Mon Feb 23 12:26:21 2009 +0000
     4.2 +++ b/lemon/concepts/graph.h	Mon Feb 23 12:33:40 2009 +0000
     4.3 @@ -20,11 +20,10 @@
     4.4  ///\file
     4.5  ///\brief The concept of Undirected Graphs.
     4.6  
     4.7 -#ifndef LEMON_CONCEPT_GRAPH_H
     4.8 -#define LEMON_CONCEPT_GRAPH_H
     4.9 +#ifndef LEMON_CONCEPTS_GRAPH_H
    4.10 +#define LEMON_CONCEPTS_GRAPH_H
    4.11  
    4.12  #include <lemon/concepts/graph_components.h>
    4.13 -#include <lemon/concepts/graph.h>
    4.14  #include <lemon/core.h>
    4.15  
    4.16  namespace lemon {
     5.1 --- a/lemon/concepts/graph_components.h	Mon Feb 23 12:26:21 2009 +0000
     5.2 +++ b/lemon/concepts/graph_components.h	Mon Feb 23 12:33:40 2009 +0000
     5.3 @@ -21,8 +21,8 @@
     5.4  ///\brief The concept of graph components.
     5.5  
     5.6  
     5.7 -#ifndef LEMON_CONCEPT_GRAPH_COMPONENTS_H
     5.8 -#define LEMON_CONCEPT_GRAPH_COMPONENTS_H
     5.9 +#ifndef LEMON_CONCEPTS_GRAPH_COMPONENTS_H
    5.10 +#define LEMON_CONCEPTS_GRAPH_COMPONENTS_H
    5.11  
    5.12  #include <lemon/core.h>
    5.13  #include <lemon/concepts/maps.h>
     6.1 --- a/lemon/concepts/heap.h	Mon Feb 23 12:26:21 2009 +0000
     6.2 +++ b/lemon/concepts/heap.h	Mon Feb 23 12:33:40 2009 +0000
     6.3 @@ -20,8 +20,8 @@
     6.4  ///\file
     6.5  ///\brief The concept of heaps.
     6.6  
     6.7 -#ifndef LEMON_CONCEPT_HEAP_H
     6.8 -#define LEMON_CONCEPT_HEAP_H
     6.9 +#ifndef LEMON_CONCEPTS_HEAP_H
    6.10 +#define LEMON_CONCEPTS_HEAP_H
    6.11  
    6.12  #include <lemon/core.h>
    6.13  #include <lemon/concept_check.h>
    6.14 @@ -243,4 +243,4 @@
    6.15      /// @}
    6.16    } // namespace lemon
    6.17  }
    6.18 -#endif // LEMON_CONCEPT_PATH_H
    6.19 +#endif
     7.1 --- a/lemon/concepts/maps.h	Mon Feb 23 12:26:21 2009 +0000
     7.2 +++ b/lemon/concepts/maps.h	Mon Feb 23 12:33:40 2009 +0000
     7.3 @@ -16,8 +16,8 @@
     7.4   *
     7.5   */
     7.6  
     7.7 -#ifndef LEMON_CONCEPT_MAPS_H
     7.8 -#define LEMON_CONCEPT_MAPS_H
     7.9 +#ifndef LEMON_CONCEPTS_MAPS_H
    7.10 +#define LEMON_CONCEPTS_MAPS_H
    7.11  
    7.12  #include <lemon/core.h>
    7.13  #include <lemon/concept_check.h>
    7.14 @@ -213,4 +213,4 @@
    7.15  
    7.16  } //namespace lemon
    7.17  
    7.18 -#endif // LEMON_CONCEPT_MAPS_H
    7.19 +#endif
     8.1 --- a/lemon/concepts/path.h	Mon Feb 23 12:26:21 2009 +0000
     8.2 +++ b/lemon/concepts/path.h	Mon Feb 23 12:33:40 2009 +0000
     8.3 @@ -21,8 +21,8 @@
     8.4  ///\brief Classes for representing paths in digraphs.
     8.5  ///
     8.6  
     8.7 -#ifndef LEMON_CONCEPT_PATH_H
     8.8 -#define LEMON_CONCEPT_PATH_H
     8.9 +#ifndef LEMON_CONCEPTS_PATH_H
    8.10 +#define LEMON_CONCEPTS_PATH_H
    8.11  
    8.12  #include <lemon/core.h>
    8.13  #include <lemon/concept_check.h>
    8.14 @@ -305,4 +305,4 @@
    8.15  
    8.16  } // namespace lemon
    8.17  
    8.18 -#endif // LEMON_CONCEPT_PATH_H
    8.19 +#endif
     9.1 --- a/lemon/lp_skeleton.h	Mon Feb 23 12:26:21 2009 +0000
     9.2 +++ b/lemon/lp_skeleton.h	Mon Feb 23 12:33:40 2009 +0000
     9.3 @@ -16,8 +16,8 @@
     9.4   *
     9.5   */
     9.6  
     9.7 -#ifndef LEMON_LP_SKELETON
     9.8 -#define LEMON_LP_SKELETON
     9.9 +#ifndef LEMON_LP_SKELETON_H
    9.10 +#define LEMON_LP_SKELETON_H
    9.11  
    9.12  #include <lemon/lp_base.h>
    9.13  
    9.14 @@ -226,4 +226,4 @@
    9.15  
    9.16  } //namespace lemon
    9.17  
    9.18 -#endif // LEMON_LP_SKELETON
    9.19 +#endif