"make check" pass under gcc-3.4.3
authorklao
Wed, 10 Nov 2004 21:42:28 +0000
changeset 978175cf8c3a994
parent 977 48962802d168
child 979 b5fb023cdb7b
"make check" pass under gcc-3.4.3
src/lemon/alteration_observer_registry.h
src/lemon/array_map.h
src/lemon/undir_graph_extender.h
src/lemon/vector_map.h
src/test/test_tools.h
     1.1 --- a/src/lemon/alteration_observer_registry.h	Wed Nov 10 20:14:32 2004 +0000
     1.2 +++ b/src/lemon/alteration_observer_registry.h	Wed Nov 10 21:42:28 2004 +0000
     1.3 @@ -74,7 +74,7 @@
     1.4      protected:
     1.5        typedef AlterationObserverRegistry Registry;
     1.6  
     1.7 -      friend class Registry;
     1.8 +      friend class AlterationObserverRegistry;
     1.9  
    1.10        /// Default constructor.
    1.11  
     2.1 --- a/src/lemon/array_map.h	Wed Nov 10 20:14:32 2004 +0000
     2.2 +++ b/src/lemon/array_map.h	Wed Nov 10 21:42:28 2004 +0000
     2.3 @@ -131,6 +131,10 @@
     2.4        }
     2.5      }
     2.6  
     2.7 +    using Parent::attach;
     2.8 +    using Parent::detach;
     2.9 +    using Parent::attached;
    2.10 +
    2.11      /** Assign operator to copy a map of the same map type.
    2.12       */
    2.13      ArrayMap& operator=(const ArrayMap& copy) {
     3.1 --- a/src/lemon/undir_graph_extender.h	Wed Nov 10 20:14:32 2004 +0000
     3.2 +++ b/src/lemon/undir_graph_extender.h	Wed Nov 10 21:42:28 2004 +0000
     3.3 @@ -35,7 +35,7 @@
     3.4      typedef typename Parent::Node Node;
     3.5  
     3.6      class Edge : public UndirEdge {
     3.7 -      friend class Graph;
     3.8 +      friend class UndirGraphExtender;
     3.9  
    3.10      protected:
    3.11        // FIXME: Marci use opposite logic in his graph wrappers. It would
     4.1 --- a/src/lemon/vector_map.h	Wed Nov 10 20:14:32 2004 +0000
     4.2 +++ b/src/lemon/vector_map.h	Wed Nov 10 21:42:28 2004 +0000
     4.3 @@ -115,6 +115,9 @@
     4.4        }
     4.5      }
     4.6  
     4.7 +    using Parent::attach;
     4.8 +    using Parent::detach;
     4.9 +    using Parent::attached;
    4.10  
    4.11      /** Assign operator to copy a map of the same map type.
    4.12       */
     5.1 --- a/src/test/test_tools.h	Wed Nov 10 20:14:32 2004 +0000
     5.2 +++ b/src/test/test_tools.h	Wed Nov 10 21:42:28 2004 +0000
     5.3 @@ -17,14 +17,18 @@
     5.4  #ifndef LEMON_TEST_TEST_TOOLS_H
     5.5  #define LEMON_TEST_TEST_TOOLS_H
     5.6  
     5.7 +#include <iostream>
     5.8 +#include <vector>
     5.9 +
    5.10 +#include <lemon/invalid.h>
    5.11 +
    5.12 +using namespace lemon;
    5.13 +
    5.14  //! \ingroup misc
    5.15  //! \file
    5.16  //! \brief Some utility to write test programs.
    5.17  
    5.18  
    5.19 -#include<iostream>
    5.20 -#include<vector>
    5.21 -
    5.22  ///If \c rc is fail, writes an error message end exit.
    5.23  
    5.24  ///If \c rc is fail, writes an error message end exit.