# HG changeset patch
# User marci
# Date 1095850079 0
# Node ID 69a8e672acb1ef88010a00bc67059cc4b7369d9e
# Parent  fc7bc2dacee51fe34d7ab006c1ed6f1d75c4900c
correction of HUGO_... preproc defines.

diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/array_map.h
--- a/src/hugo/array_map.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/array_map.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef ARRAY_MAP_H
-#define ARRAY_MAP_H
+#ifndef HUGO_ARRAY_MAP_H
+#define HUGO_ARRAY_MAP_H
 
 #include <memory>
 
@@ -331,4 +331,4 @@
 
 }
 
-#endif
+#endif //HUGO_ARRAY_MAP_H
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/bin_heap.h
--- a/src/hugo/bin_heap.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/bin_heap.h	Wed Sep 22 10:47:59 2004 +0000
@@ -244,4 +244,4 @@
 
 } // namespace hugo
 
-#endif // BIN_HEAP_HH
+#endif // HUGO_BIN_HEAP_H
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/default_map.h
--- a/src/hugo/default_map.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/default_map.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef DEFAULT_MAP_H
-#define DEFAULT_MAP_H
+#ifndef HUGO_DEFAULT_MAP_H
+#define HUGO_DEFAULT_MAP_H
 
 
 #include <hugo/array_map.h>
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/extended_pair.h
--- a/src/hugo/extended_pair.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/extended_pair.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef EXTENDED_PAIR_H
-#define EXTENDED_PAIR_H
+#ifndef HUGO_EXTENDED_PAIR_H
+#define HUGO_EXTENDED_PAIR_H
 
 template <typename T1, typename A1, typename T2, typename A2>
 struct extended_pair {
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/map_bits.h
--- a/src/hugo/map_bits.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/map_bits.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*- 
-#ifndef MAP_BITS_H
-#define MAP_BITS_H
+#ifndef HUGO_MAP_BITS_H
+#define HUGO_MAP_BITS_H
 
 ///\ingroup graphmaps
 ///\file
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/map_defines.h
--- a/src/hugo/map_defines.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/map_defines.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef MAP_DEFINES_H
-#define MAP_DEFINES_H
+#ifndef HUGO_MAP_DEFINES_H
+#define HUGO_MAP_DEFINES_H
 
 ///\ingroup graphmaps
 ///\file
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/map_iterator.h
--- a/src/hugo/map_iterator.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/map_iterator.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef MAP_ITERATOR_H
-#define MAP_ITERATOR_H
+#ifndef HUGO_MAP_ITERATOR_H
+#define HUGO_MAP_ITERATOR_H
 
 #include <iterator>
 
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/map_registry.h
--- a/src/hugo/map_registry.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/map_registry.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef MAP_REGISTRY_H
-#define MAP_REGISTRY_H
+#ifndef HUGO_MAP_REGISTRY_H
+#define HUGO_MAP_REGISTRY_H
 
 #include <vector>
 
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/min_cost_flow.h
--- a/src/hugo/min_cost_flow.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/min_cost_flow.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef HUGO_MINCOSTFLOWS_H
-#define HUGO_MINCOSTFLOWS_H
+#ifndef HUGO_MIN_COST_FLOW_H
+#define HUGO_MIN_COST_FLOW_H
 
 ///\ingroup flowalgs
 ///\file
@@ -238,4 +238,4 @@
 
 } //namespace hugo
 
-#endif //HUGO_MINCOSTFLOWS_H
+#endif //HUGO_MIN_COST_FLOW_H
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/suurballe.h
--- a/src/hugo/suurballe.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/suurballe.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef HUGO_MINLENGTHPATHS_H
-#define HUGO_MINLENGTHPATHS_H
+#ifndef HUGO_SUURBALLE_H
+#define HUGO_SUURBALLE_H
 
 ///\ingroup flowalgs
 ///\file
@@ -197,4 +197,4 @@
 
 } //namespace hugo
 
-#endif //HUGO_MINLENGTHPATHS_H
+#endif //HUGO_SUURBALLE_H
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/sym_map.h
--- a/src/hugo/sym_map.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/sym_map.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef SYM_MAP_H
-#define SYM_MAP_H
+#ifndef HUGO_SYM_MAP_H
+#define HUGO_SYM_MAP_H
 
 ///\ingroup graphmaps
 ///\file
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/hugo/vector_map.h
--- a/src/hugo/vector_map.h	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/hugo/vector_map.h	Wed Sep 22 10:47:59 2004 +0000
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef VECTOR_MAP_H
-#define VECTOR_MAP_H
+#ifndef HUGO_VECTOR_MAP_H
+#define HUGO_VECTOR_MAP_H
 
 #include <vector>
 
diff -r fc7bc2dacee5 -r 69a8e672acb1 src/work/marci/makefile
--- a/src/work/marci/makefile	Wed Sep 22 09:58:17 2004 +0000
+++ b/src/work/marci/makefile	Wed Sep 22 10:47:59 2004 +0000
@@ -4,7 +4,7 @@
 INCLUDEDIRS ?= -I../{jacint,marci,alpar,klao,akos,athos} -I../.. -I.. -I$(BOOSTROOT)
 
 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-BINARIES = sub_graph_wrapper_demo.cc graph_wrapper_time max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_demo top_sort_test max_flow_1 proba7 proba8
+BINARIES = sub_graph_wrapper_demo.cc graph_wrapper_time max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_demo top_sort_test max_flow_1 proba7 proba10
 #BINARIES = preflow_bug
 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda