LEMON/LEMON-official Changeset - r263:be8a861d3bb7

Repositories » LEMON » LEMON-official

Changeset - r263:be8a861d3bb7

« 260:c69106

265:983d8c »

r263:be8a861d3bb7

Mon, 15 Sep 2008 22:28:32

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

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

0 8 0

default

8 files changed with 40 insertions and 16 deletions:

lemon/bits/array_map.h

lemon/bits/graph_extender.h

lemon/bits/map_extender.h

lemon/bits/vector_map.h

lemon/concepts/digraph.h

lemon/concepts/graph.h

lemon/concepts/graph_components.h

test/graph_test.h

↑ Collapse diff ↑

lemon/bits/array_map.h

Show inline comments

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

lemon/bits/graph_extender.h

Show inline comments

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

lemon/bits/map_extender.h

Show inline comments

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

lemon/bits/vector_map.h

Show inline comments

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

lemon/concepts/digraph.h

Show inline comments

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

lemon/concepts/graph.h

Show inline comments

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

lemon/concepts/graph_components.h

Show inline comments

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

test/graph_test.h

Show inline comments

@@ -213,8 +213,8 @@
 		    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,8 +243,8 @@
 		    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,8 +273,8 @@
 		    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[].");
 		    // }
+		  }

0 comments (0 inline)

RhodeCode