Changeset 263:be8a861d3bb7 in lemon-main

Timestamp:

09/15/08 22:28:32 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Make copy constr and op= of the default maps private (ticket #137)

Files:

• lemon/bits/array_map.h (modified) (2 diffs)
• lemon/bits/graph_extender.h (modified) (5 diffs)
• lemon/bits/map_extender.h (modified) (4 diffs)
• lemon/bits/vector_map.h (modified) (1 diff)
• lemon/concepts/digraph.h (modified) (2 diffs)
• lemon/concepts/graph.h (modified) (3 diffs)
• lemon/concepts/graph_components.h (modified) (6 diffs)
• test/graph_test.h (modified) (3 diffs)

lemon/bits/array_map.h

@@ -104 +104 @@
     }
 
+  private:
     /// \brief Constructor to copy a map of the same map type.
     ///
@@ -151 +152 @@
     }
 
+  public:
     /// \brief The destructor of the map.
     ///

lemon/bits/graph_extender.h

@@ -228 +228 @@
         : Parent(digraph, value) {}
 
+    private:
       NodeMap& operator=(const NodeMap& cmap) {
         return operator=<NodeMap>(cmap);
@@ -252 +253 @@
         : Parent(digraph, value) {}
 
+    private:
       ArcMap& operator=(const ArcMap& cmap) {
         return operator=<ArcMap>(cmap);
@@ -609 +611 @@
         : Parent(graph, value) {}
 
+    private:
       NodeMap& operator=(const NodeMap& cmap) {
         return operator=<NodeMap>(cmap);
@@ -633 +636 @@
         : Parent(graph, value) {}
 
+    private:
       ArcMap& operator=(const ArcMap& cmap) {
         return operator=<ArcMap>(cmap);
@@ -658 +662 @@
         : Parent(graph, value) {}
 
+    private:
       EdgeMap& operator=(const EdgeMap& cmap) {
         return operator=<EdgeMap>(cmap);

lemon/bits/map_extender.h

@@ -63 +63 @@
       : Parent(graph, value) {}
 
+  private:
     MapExtender& operator=(const MapExtender& cmap) {
       return operator=<MapExtender>(cmap);
@@ -73 +74 @@
     }
 
+  public:
     class MapIt : public Item {
     public:
@@ -201 +203 @@
       : Parent(_graph, _value), graph(_graph) {}
 
+  private:
     SubMapExtender& operator=(const SubMapExtender& cmap) {
       return operator=<MapExtender>(cmap);
@@ -215 +218 @@
     }
 
+  public:
     class MapIt : public Item {
     public:

lemon/bits/vector_map.h

@@ -101 +101 @@
     }
 
+  private:
     /// \brief Copy constructor
     ///

lemon/concepts/digraph.h

@@ -435 +435 @@
         NodeMap(const Digraph&, T) { }
 
+      private:
         ///Copy constructor
         NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
@@ -457 +458 @@
         ///\e
         ArcMap(const Digraph&, T) { }
+      private:
         ///Copy constructor
         ArcMap(const ArcMap& em) : ReadWriteMap<Arc,T>(em) { }

lemon/concepts/graph.h

@@ -513 +513 @@
         NodeMap(const Graph&, T) { }
 
+      private:
         ///Copy constructor
         NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
@@ -536 +537 @@
         ///\e
         ArcMap(const Graph&, T) { }
+      private:
         ///Copy constructor
         ArcMap(const ArcMap& em) : ReadWriteMap<Arc,T>(em) { }
@@ -559 +561 @@
         ///\e
         EdgeMap(const Graph&, T) { }
+      private:
         ///Copy constructor
         EdgeMap(const EdgeMap& em) : ReadWriteMap<Edge,T>(em) {}

lemon/concepts/graph_components.h

@@ -1006 +1006 @@
       /// Construct a new map for the graph and initalise the values.
       GraphMap(const Graph&, const Value&) {}
+
+    private:
       /// \brief Copy constructor.
       ///
@@ -1022 +1024 @@
       }
 
+    public:
       template<typename _Map>
       struct Constraints {
@@ -1031 +1034 @@
           _Map a2(g,t);
           // Copy constructor.
-          _Map b(c);
-
-          ReadMap<Key, Value> cmap;
-          b = cmap;
-
+          // _Map b(c);
+
+          // ReadMap<Key, Value> cmap;
+          // b = cmap;
+
+          ignore_unused_variable_warning(a);
           ignore_unused_variable_warning(a2);
-          ignore_unused_variable_warning(b);
+          // ignore_unused_variable_warning(b);
         }
 
@@ -1083 +1087 @@
           : Parent(digraph, value) {}
 
+      private:
         /// \brief Copy constructor.
         ///
@@ -1120 +1125 @@
           : Parent(digraph, value) {}
 
+      private:
         /// \brief Copy constructor.
         ///
@@ -1216 +1222 @@
           : Parent(graph, value) {}
 
+      private:
         /// \brief Copy constructor.
         ///

test/graph_test.h

@@ -213 +213 @@
     check(s == 0, "Wrong sum.");
 
-    map = constMap<Node>(12);
-    for (NodeIt it(G); it != INVALID; ++it) {
-      check(map[it] == 12, "Wrong operator[].");
-    }
+    // map = constMap<Node>(12);
+    // for (NodeIt it(G); it != INVALID; ++it) {
+    //   check(map[it] == 12, "Wrong operator[].");
+    // }
   }
 
@@ -243 +243 @@
     check(s == 0, "Wrong sum.");
 
-    map = constMap<Arc>(12);
-    for (ArcIt it(G); it != INVALID; ++it) {
-      check(map[it] == 12, "Wrong operator[].");
-    }
+    // map = constMap<Arc>(12);
+    // for (ArcIt it(G); it != INVALID; ++it) {
+    //   check(map[it] == 12, "Wrong operator[].");
+    // }
   }
 
@@ -273 +273 @@
     check(s == 0, "Wrong sum.");
 
-    map = constMap<Edge>(12);
-    for (EdgeIt it(G); it != INVALID; ++it) {
-      check(map[it] == 12, "Wrong operator[].");
-    }
+    // map = constMap<Edge>(12);
+    // for (EdgeIt it(G); it != INVALID; ++it) {
+    //   check(map[it] == 12, "Wrong operator[].");
+    // }
   }