# HG changeset patch # User klao # Date 1100122948 0 # Node ID 175cf8c3a994fd5ed9e3a0c1bc0a369db0f56f14 # Parent 48962802d168885637a5ee7e630157d957418d36 "make check" pass under gcc-3.4.3 diff -r 48962802d168 -r 175cf8c3a994 src/lemon/alteration_observer_registry.h --- a/src/lemon/alteration_observer_registry.h Wed Nov 10 20:14:32 2004 +0000 +++ b/src/lemon/alteration_observer_registry.h Wed Nov 10 21:42:28 2004 +0000 @@ -74,7 +74,7 @@ protected: typedef AlterationObserverRegistry Registry; - friend class Registry; + friend class AlterationObserverRegistry; /// Default constructor. diff -r 48962802d168 -r 175cf8c3a994 src/lemon/array_map.h --- a/src/lemon/array_map.h Wed Nov 10 20:14:32 2004 +0000 +++ b/src/lemon/array_map.h Wed Nov 10 21:42:28 2004 +0000 @@ -131,6 +131,10 @@ } } + using Parent::attach; + using Parent::detach; + using Parent::attached; + /** Assign operator to copy a map of the same map type. */ ArrayMap& operator=(const ArrayMap& copy) { diff -r 48962802d168 -r 175cf8c3a994 src/lemon/undir_graph_extender.h --- a/src/lemon/undir_graph_extender.h Wed Nov 10 20:14:32 2004 +0000 +++ b/src/lemon/undir_graph_extender.h Wed Nov 10 21:42:28 2004 +0000 @@ -35,7 +35,7 @@ typedef typename Parent::Node Node; class Edge : public UndirEdge { - friend class Graph; + friend class UndirGraphExtender; protected: // FIXME: Marci use opposite logic in his graph wrappers. It would diff -r 48962802d168 -r 175cf8c3a994 src/lemon/vector_map.h --- a/src/lemon/vector_map.h Wed Nov 10 20:14:32 2004 +0000 +++ b/src/lemon/vector_map.h Wed Nov 10 21:42:28 2004 +0000 @@ -115,6 +115,9 @@ } } + using Parent::attach; + using Parent::detach; + using Parent::attached; /** Assign operator to copy a map of the same map type. */ diff -r 48962802d168 -r 175cf8c3a994 src/test/test_tools.h --- a/src/test/test_tools.h Wed Nov 10 20:14:32 2004 +0000 +++ b/src/test/test_tools.h Wed Nov 10 21:42:28 2004 +0000 @@ -17,14 +17,18 @@ #ifndef LEMON_TEST_TEST_TOOLS_H #define LEMON_TEST_TEST_TOOLS_H +#include +#include + +#include + +using namespace lemon; + //! \ingroup misc //! \file //! \brief Some utility to write test programs. -#include -#include - ///If \c rc is fail, writes an error message end exit. ///If \c rc is fail, writes an error message end exit.