1.1 --- a/src/hugo/array_map.h	Wed Sep 22 09:58:17 2004 +0000
     1.2 +++ b/src/hugo/array_map.h	Wed Sep 22 10:47:59 2004 +0000
     1.3 @@ -1,6 +1,6 @@
     1.4  // -*- c++ -*-
     1.5 -#ifndef ARRAY_MAP_H
     1.6 -#define ARRAY_MAP_H
     1.7 +#ifndef HUGO_ARRAY_MAP_H
     1.8 +#define HUGO_ARRAY_MAP_H
     1.9  
    1.10  #include <memory>
    1.11  
    1.12 @@ -331,4 +331,4 @@
    1.13  
    1.14  }
    1.15  
    1.16 -#endif
    1.17 +#endif //HUGO_ARRAY_MAP_H

     2.1 --- a/src/hugo/bin_heap.h	Wed Sep 22 09:58:17 2004 +0000
     2.2 +++ b/src/hugo/bin_heap.h	Wed Sep 22 10:47:59 2004 +0000
     2.3 @@ -244,4 +244,4 @@
     2.4  
     2.5  } // namespace hugo
     2.6  
     2.7 -#endif // BIN_HEAP_HH
     2.8 +#endif // HUGO_BIN_HEAP_H

     3.1 --- a/src/hugo/default_map.h	Wed Sep 22 09:58:17 2004 +0000
     3.2 +++ b/src/hugo/default_map.h	Wed Sep 22 10:47:59 2004 +0000
     3.3 @@ -1,6 +1,6 @@
     3.4  // -*- c++ -*-
     3.5 -#ifndef DEFAULT_MAP_H
     3.6 -#define DEFAULT_MAP_H
     3.7 +#ifndef HUGO_DEFAULT_MAP_H
     3.8 +#define HUGO_DEFAULT_MAP_H
     3.9  
    3.10  
    3.11  #include <hugo/array_map.h>

     4.1 --- a/src/hugo/extended_pair.h	Wed Sep 22 09:58:17 2004 +0000
     4.2 +++ b/src/hugo/extended_pair.h	Wed Sep 22 10:47:59 2004 +0000
     4.3 @@ -1,6 +1,6 @@
     4.4  // -*- c++ -*-
     4.5 -#ifndef EXTENDED_PAIR_H
     4.6 -#define EXTENDED_PAIR_H
     4.7 +#ifndef HUGO_EXTENDED_PAIR_H
     4.8 +#define HUGO_EXTENDED_PAIR_H
     4.9  
    4.10  template <typename T1, typename A1, typename T2, typename A2>
    4.11  struct extended_pair {

     5.1 --- a/src/hugo/map_bits.h	Wed Sep 22 09:58:17 2004 +0000
     5.2 +++ b/src/hugo/map_bits.h	Wed Sep 22 10:47:59 2004 +0000
     5.3 @@ -1,6 +1,6 @@
     5.4  // -*- c++ -*- 
     5.5 -#ifndef MAP_BITS_H
     5.6 -#define MAP_BITS_H
     5.7 +#ifndef HUGO_MAP_BITS_H
     5.8 +#define HUGO_MAP_BITS_H
     5.9  
    5.10  ///\ingroup graphmaps
    5.11  ///\file

     6.1 --- a/src/hugo/map_defines.h	Wed Sep 22 09:58:17 2004 +0000
     6.2 +++ b/src/hugo/map_defines.h	Wed Sep 22 10:47:59 2004 +0000
     6.3 @@ -1,6 +1,6 @@
     6.4  // -*- c++ -*-
     6.5 -#ifndef MAP_DEFINES_H
     6.6 -#define MAP_DEFINES_H
     6.7 +#ifndef HUGO_MAP_DEFINES_H
     6.8 +#define HUGO_MAP_DEFINES_H
     6.9  
    6.10  ///\ingroup graphmaps
    6.11  ///\file

     7.1 --- a/src/hugo/map_iterator.h	Wed Sep 22 09:58:17 2004 +0000
     7.2 +++ b/src/hugo/map_iterator.h	Wed Sep 22 10:47:59 2004 +0000
     7.3 @@ -1,6 +1,6 @@
     7.4  // -*- c++ -*-
     7.5 -#ifndef MAP_ITERATOR_H
     7.6 -#define MAP_ITERATOR_H
     7.7 +#ifndef HUGO_MAP_ITERATOR_H
     7.8 +#define HUGO_MAP_ITERATOR_H
     7.9  
    7.10  #include <iterator>
    7.11  

     8.1 --- a/src/hugo/map_registry.h	Wed Sep 22 09:58:17 2004 +0000
     8.2 +++ b/src/hugo/map_registry.h	Wed Sep 22 10:47:59 2004 +0000
     8.3 @@ -1,6 +1,6 @@
     8.4  // -*- c++ -*-
     8.5 -#ifndef MAP_REGISTRY_H
     8.6 -#define MAP_REGISTRY_H
     8.7 +#ifndef HUGO_MAP_REGISTRY_H
     8.8 +#define HUGO_MAP_REGISTRY_H
     8.9  
    8.10  #include <vector>
    8.11  

     9.1 --- a/src/hugo/min_cost_flow.h	Wed Sep 22 09:58:17 2004 +0000
     9.2 +++ b/src/hugo/min_cost_flow.h	Wed Sep 22 10:47:59 2004 +0000
     9.3 @@ -1,6 +1,6 @@
     9.4  // -*- c++ -*-
     9.5 -#ifndef HUGO_MINCOSTFLOWS_H
     9.6 -#define HUGO_MINCOSTFLOWS_H
     9.7 +#ifndef HUGO_MIN_COST_FLOW_H
     9.8 +#define HUGO_MIN_COST_FLOW_H
     9.9  
    9.10  ///\ingroup flowalgs
    9.11  ///\file
    9.12 @@ -238,4 +238,4 @@
    9.13  
    9.14  } //namespace hugo
    9.15  
    9.16 -#endif //HUGO_MINCOSTFLOWS_H
    9.17 +#endif //HUGO_MIN_COST_FLOW_H

    10.1 --- a/src/hugo/suurballe.h	Wed Sep 22 09:58:17 2004 +0000
    10.2 +++ b/src/hugo/suurballe.h	Wed Sep 22 10:47:59 2004 +0000
    10.3 @@ -1,6 +1,6 @@
    10.4  // -*- c++ -*-
    10.5 -#ifndef HUGO_MINLENGTHPATHS_H
    10.6 -#define HUGO_MINLENGTHPATHS_H
    10.7 +#ifndef HUGO_SUURBALLE_H
    10.8 +#define HUGO_SUURBALLE_H
    10.9  
   10.10  ///\ingroup flowalgs
   10.11  ///\file
   10.12 @@ -197,4 +197,4 @@
   10.13  
   10.14  } //namespace hugo
   10.15  
   10.16 -#endif //HUGO_MINLENGTHPATHS_H
   10.17 +#endif //HUGO_SUURBALLE_H

    11.1 --- a/src/hugo/sym_map.h	Wed Sep 22 09:58:17 2004 +0000
    11.2 +++ b/src/hugo/sym_map.h	Wed Sep 22 10:47:59 2004 +0000
    11.3 @@ -1,6 +1,6 @@
    11.4  // -*- c++ -*-
    11.5 -#ifndef SYM_MAP_H
    11.6 -#define SYM_MAP_H
    11.7 +#ifndef HUGO_SYM_MAP_H
    11.8 +#define HUGO_SYM_MAP_H
    11.9  
   11.10  ///\ingroup graphmaps
   11.11  ///\file

    12.1 --- a/src/hugo/vector_map.h	Wed Sep 22 09:58:17 2004 +0000
    12.2 +++ b/src/hugo/vector_map.h	Wed Sep 22 10:47:59 2004 +0000
    12.3 @@ -1,6 +1,6 @@
    12.4  // -*- c++ -*-
    12.5 -#ifndef VECTOR_MAP_H
    12.6 -#define VECTOR_MAP_H
    12.7 +#ifndef HUGO_VECTOR_MAP_H
    12.8 +#define HUGO_VECTOR_MAP_H
    12.9  
   12.10  #include <vector>
   12.11  

    13.1 --- a/src/work/marci/makefile	Wed Sep 22 09:58:17 2004 +0000
    13.2 +++ b/src/work/marci/makefile	Wed Sep 22 10:47:59 2004 +0000
    13.3 @@ -4,7 +4,7 @@
    13.4  INCLUDEDIRS ?= -I../{jacint,marci,alpar,klao,akos,athos} -I../.. -I.. -I$(BOOSTROOT)
    13.5  
    13.6  LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
    13.7 -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
    13.8 +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
    13.9  #BINARIES = preflow_bug
   13.10  #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
   13.11