Changeset 531:66f1c466889f in lemon-0.x

Timestamp:

05/05/04 09:53:51 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@697

Message:

Compiles with are icc, as well.

Location:

src

Files:

• include/smart_graph.h (modified) (3 diffs)
• work/alpar/list_graph.h (modified) (9 diffs)

src/include/smart_graph.h

@@ -360 +360 @@
       const NodeMap<T>& operator=(const NodeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }
@@ -449 +449 @@
       const EdgeMap<T>& operator=(const EdgeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }
@@ -594 +594 @@
       const SymEdgeMap<T>& operator=(const SymEdgeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }

src/work/alpar/list_graph.h

@@ -473 +473 @@
       const NodeMap<T>& operator=(const NodeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }
@@ -562 +562 @@
       const EdgeMap<T>& operator=(const EdgeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }
@@ -716 +716 @@
       const SymEdgeMap<T>& operator=(const SymEdgeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }
@@ -1082 +1082 @@
       const NodeMap<T>& operator=(const NodeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }
@@ -1155 +1155 @@
   public:
     class Node;
+    int id(Node v) const; 
+
+    class Node : public NodeGraphType::Node {
+      friend class EdgeSet;
+      //      template <typename T> friend class NodeMap;
+      
+      friend class Edge;
+      friend class OutEdgeIt;
+      friend class InEdgeIt;
+      friend class SymEdge;
+
+    public:
+      friend int EdgeSet::id(Node v) const; 
+      //      Node(int nn) {n=nn;}
+    public:
+      Node() : NodeGraphType::Node() {}
+      Node (Invalid i) : NodeGraphType::Node(i) {}
+      Node(const typename NodeGraphType::Node &n) : NodeGraphType::Node(n) {}
+    };
+    
+    class NodeIt : public NodeGraphType::NodeIt {
+      friend class EdgeSet;
+    public:
+      NodeIt() : NodeGraphType::NodeIt() { }
+      NodeIt (Invalid i) : NodeGraphType::NodeIt(i) {}
+      NodeIt(const EdgeSet& _G) : NodeGraphType::NodeIt(_G.G) { }
+      NodeIt(const typename NodeGraphType::NodeIt &n)
+        : NodeGraphType::NodeIt(n) {}
+      operator Node() { return Node(*this);}
+    };
 
   private:
@@ -1306 +1336 @@
     }
 
-    int id(Node v) const { return G.id(v); }
     int id(Edge e) const { return e.n; }
 
@@ -1387 +1416 @@
 //       first_node=first_free_node=first_free_edge=-1;
 //     }
-
-  public:
-    class Node : public NodeGraphType::Node {
-      friend class EdgeSet;
-      //      template <typename T> friend class NodeMap;
-      
-      friend class Edge;
-      friend class OutEdgeIt;
-      friend class InEdgeIt;
-      friend class SymEdge;
-
-    protected:
-      friend int EdgeSet::id(Node v) const; 
-      //      Node(int nn) {n=nn;}
-    public:
-      Node() : NodeGraphType::Node() {}
-      Node (Invalid i) : NodeGraphType::Node(i) {}
-      Node(const typename NodeGraphType::Node &n) : NodeGraphType::Node(n) {}
-    };
-    
-    class NodeIt : public NodeGraphType::NodeIt {
-      friend class EdgeSet;
-    public:
-      NodeIt() : NodeGraphType::NodeIt() { }
-      NodeIt (Invalid i) : NodeGraphType::NodeIt(i) {}
-      NodeIt(const EdgeSet& _G) : NodeGraphType::NodeIt(_G.G) { }
-      NodeIt(const typename NodeGraphType::NodeIt &n)
-        : NodeGraphType::NodeIt(n) {}
-      operator Node() { return Node(*this);}
-    };
 
     class Edge {
@@ -1579 +1578 @@
       const EdgeMap<T>& operator=(const EdgeMap<TT> &m)
       {
-        copy(m.container.begin(), m.container.end(), container.begin());
+        std::copy(m.container.begin(), m.container.end(), container.begin());
         return *this;
       }
@@ -1589 +1588 @@
   };
 
+  template< typename GG>
+  int EdgeSet<GG>::id(Node v) const { return G.id(v); }
+
 /// @}