# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1235392420 0
# Node ID 1c5d6e47921f736a22b2dc4c891111cc8235c9e0
# Parent  88bd39ef7d982e4e75891e5804c06a6576eac7e6# Parent  f5bc148f7e1f300a6b87580a85a8e673da9322dc
Merge

diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/bits/path_dump.h
--- a/lemon/bits/path_dump.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/bits/path_dump.h	Mon Feb 23 12:33:40 2009 +0000
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef LEMON_BITS_PRED_MAP_PATH_H
-#define LEMON_BITS_PRED_MAP_PATH_H
+#ifndef LEMON_BITS_PATH_DUMP_H
+#define LEMON_BITS_PATH_DUMP_H
 
 #include <lemon/core.h>
 #include <lemon/concept_check.h>
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/bits/windows.h
--- a/lemon/bits/windows.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/bits/windows.h	Mon Feb 23 12:33:40 2009 +0000
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef LEMON_WINDOWS_H
-#define LEMON_WINDOWS_H
+#ifndef LEMON_BITS_WINDOWS_H
+#define LEMON_BITS_WINDOWS_H
 
 #include <string>
 
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/concepts/digraph.h
--- a/lemon/concepts/digraph.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/concepts/digraph.h	Mon Feb 23 12:33:40 2009 +0000
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef LEMON_CONCEPT_DIGRAPH_H
-#define LEMON_CONCEPT_DIGRAPH_H
+#ifndef LEMON_CONCEPTS_DIGRAPH_H
+#define LEMON_CONCEPTS_DIGRAPH_H
 
 ///\ingroup graph_concepts
 ///\file
@@ -484,4 +484,4 @@
 
 
 
-#endif // LEMON_CONCEPT_DIGRAPH_H
+#endif
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/concepts/graph.h
--- a/lemon/concepts/graph.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/concepts/graph.h	Mon Feb 23 12:33:40 2009 +0000
@@ -20,11 +20,10 @@
 ///\file
 ///\brief The concept of Undirected Graphs.
 
-#ifndef LEMON_CONCEPT_GRAPH_H
-#define LEMON_CONCEPT_GRAPH_H
+#ifndef LEMON_CONCEPTS_GRAPH_H
+#define LEMON_CONCEPTS_GRAPH_H
 
 #include <lemon/concepts/graph_components.h>
-#include <lemon/concepts/graph.h>
 #include <lemon/core.h>
 
 namespace lemon {
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/concepts/graph_components.h
--- a/lemon/concepts/graph_components.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/concepts/graph_components.h	Mon Feb 23 12:33:40 2009 +0000
@@ -21,8 +21,8 @@
 ///\brief The concept of graph components.
 
 
-#ifndef LEMON_CONCEPT_GRAPH_COMPONENTS_H
-#define LEMON_CONCEPT_GRAPH_COMPONENTS_H
+#ifndef LEMON_CONCEPTS_GRAPH_COMPONENTS_H
+#define LEMON_CONCEPTS_GRAPH_COMPONENTS_H
 
 #include <lemon/core.h>
 #include <lemon/concepts/maps.h>
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/concepts/heap.h
--- a/lemon/concepts/heap.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/concepts/heap.h	Mon Feb 23 12:33:40 2009 +0000
@@ -20,8 +20,8 @@
 ///\file
 ///\brief The concept of heaps.
 
-#ifndef LEMON_CONCEPT_HEAP_H
-#define LEMON_CONCEPT_HEAP_H
+#ifndef LEMON_CONCEPTS_HEAP_H
+#define LEMON_CONCEPTS_HEAP_H
 
 #include <lemon/core.h>
 #include <lemon/concept_check.h>
@@ -243,4 +243,4 @@
     /// @}
   } // namespace lemon
 }
-#endif // LEMON_CONCEPT_PATH_H
+#endif
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/concepts/maps.h
--- a/lemon/concepts/maps.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/concepts/maps.h	Mon Feb 23 12:33:40 2009 +0000
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef LEMON_CONCEPT_MAPS_H
-#define LEMON_CONCEPT_MAPS_H
+#ifndef LEMON_CONCEPTS_MAPS_H
+#define LEMON_CONCEPTS_MAPS_H
 
 #include <lemon/core.h>
 #include <lemon/concept_check.h>
@@ -213,4 +213,4 @@
 
 } //namespace lemon
 
-#endif // LEMON_CONCEPT_MAPS_H
+#endif
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/concepts/path.h
--- a/lemon/concepts/path.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/concepts/path.h	Mon Feb 23 12:33:40 2009 +0000
@@ -21,8 +21,8 @@
 ///\brief Classes for representing paths in digraphs.
 ///
 
-#ifndef LEMON_CONCEPT_PATH_H
-#define LEMON_CONCEPT_PATH_H
+#ifndef LEMON_CONCEPTS_PATH_H
+#define LEMON_CONCEPTS_PATH_H
 
 #include <lemon/core.h>
 #include <lemon/concept_check.h>
@@ -305,4 +305,4 @@
 
 } // namespace lemon
 
-#endif // LEMON_CONCEPT_PATH_H
+#endif
diff -r 88bd39ef7d98 -r 1c5d6e47921f lemon/lp_skeleton.h
--- a/lemon/lp_skeleton.h	Mon Feb 23 12:26:21 2009 +0000
+++ b/lemon/lp_skeleton.h	Mon Feb 23 12:33:40 2009 +0000
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef LEMON_LP_SKELETON
-#define LEMON_LP_SKELETON
+#ifndef LEMON_LP_SKELETON_H
+#define LEMON_LP_SKELETON_H
 
 #include <lemon/lp_base.h>
 
@@ -226,4 +226,4 @@
 
 } //namespace lemon
 
-#endif // LEMON_LP_SKELETON
+#endif