[Lemon-commits] [lemon_svn] klao: r1366 - in hugo/trunk/src: lemon test

[Lemon SVN]

Author: klao
Date: Wed Nov 10 22:42:28 2004
New Revision: 1366

Modified:
   hugo/trunk/src/lemon/alteration_observer_registry.h
   hugo/trunk/src/lemon/array_map.h
   hugo/trunk/src/lemon/undir_graph_extender.h
   hugo/trunk/src/lemon/vector_map.h
   hugo/trunk/src/test/test_tools.h

Log:
"make check" pass under gcc-3.4.3


Modified: hugo/trunk/src/lemon/alteration_observer_registry.h
==============================================================================
--- hugo/trunk/src/lemon/alteration_observer_registry.h	(original)
+++ hugo/trunk/src/lemon/alteration_observer_registry.h	Wed Nov 10 22:42:28 2004
@@ -74,7 +74,7 @@
     protected:
       typedef AlterationObserverRegistry Registry;
 
-      friend class Registry;
+      friend class AlterationObserverRegistry;
 
       /// Default constructor.
 

Modified: hugo/trunk/src/lemon/array_map.h
==============================================================================
--- hugo/trunk/src/lemon/array_map.h	(original)
+++ hugo/trunk/src/lemon/array_map.h	Wed Nov 10 22:42:28 2004
@@ -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) {

Modified: hugo/trunk/src/lemon/undir_graph_extender.h
==============================================================================
--- hugo/trunk/src/lemon/undir_graph_extender.h	(original)
+++ hugo/trunk/src/lemon/undir_graph_extender.h	Wed Nov 10 22:42:28 2004
@@ -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

Modified: hugo/trunk/src/lemon/vector_map.h
==============================================================================
--- hugo/trunk/src/lemon/vector_map.h	(original)
+++ hugo/trunk/src/lemon/vector_map.h	Wed Nov 10 22:42:28 2004
@@ -115,6 +115,9 @@
       }
     }
 
+    using Parent::attach;
+    using Parent::detach;
+    using Parent::attached;
 
     /** Assign operator to copy a map of the same map type.
      */

Modified: hugo/trunk/src/test/test_tools.h
==============================================================================
--- hugo/trunk/src/test/test_tools.h	(original)
+++ hugo/trunk/src/test/test_tools.h	Wed Nov 10 22:42:28 2004
@@ -17,14 +17,18 @@
 #ifndef LEMON_TEST_TEST_TOOLS_H
 #define LEMON_TEST_TEST_TOOLS_H
 
+#include <iostream>
+#include <vector>
+
+#include <lemon/invalid.h>
+
+using namespace lemon;
+
 //! \ingroup misc
 //! \file
 //! \brief Some utility to write test programs.
 
 
-#include<iostream>
-#include<vector>
-
 ///If \c rc is fail, writes an error message end exit.
 
 ///If \c rc is fail, writes an error message end exit.