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

@@ -105,2 +105,3 @@
 		  private:
 		    /// \brief Constructor to copy a map of the same map type.
@@ -152,2 +153,3 @@
 		  public:
 		    /// \brief The destructor of the map.

lemon/bits/graph_extender.h

Show inline comments

@@ -229,2 +229,3 @@
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
@@ -253,2 +254,3 @@
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
@@ -610,2 +612,3 @@
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
@@ -634,2 +637,3 @@
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
@@ -659,2 +663,3 @@
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {

lemon/bits/map_extender.h

Show inline comments

@@ -64,2 +64,3 @@
 		  private:
 		    MapExtender& operator=(const MapExtender& cmap) {
@@ -74,2 +75,3 @@
 		  public:
 		    class MapIt : public Item {
@@ -202,2 +204,3 @@
 		  private:
 		    SubMapExtender& operator=(const SubMapExtender& cmap) {
@@ -216,2 +219,3 @@
 		  public:
 		    class MapIt : public Item {

lemon/bits/vector_map.h

Show inline comments

@@ -102,2 +102,3 @@
 		  private:
 		    /// \brief Copy constructor

lemon/concepts/digraph.h

Show inline comments

@@ -436,2 +436,3 @@
 		      private:
 		        ///Copy constructor
@@ -458,2 +459,3 @@
 		        ArcMap(const Digraph&, T) { }
 		      private:
 		        ///Copy constructor

lemon/concepts/graph.h

Show inline comments

@@ -514,2 +514,3 @@
 		      private:
 		        ///Copy constructor
@@ -537,2 +538,3 @@
 		        ArcMap(const Graph&, T) { }
 		      private:
 		        ///Copy constructor
@@ -560,2 +562,3 @@
 		        EdgeMap(const Graph&, T) { }
 		      private:
 		        ///Copy constructor

lemon/concepts/graph_components.h

Show inline comments

@@ -1007,2 +1007,4 @@
 		      GraphMap(const Graph&, const Value&) {}
 		    private:
 		      /// \brief Copy constructor.
@@ -1023,2 +1025,3 @@
 		    public:
 		      template<typename _Map>
@@ -1032,9 +1035,10 @@
 		          // 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);
+		        }
@@ -1084,2 +1088,3 @@
 		      private:
 		        /// \brief Copy constructor.
@@ -1121,2 +1126,3 @@
 		      private:
 		        /// \brief Copy constructor.
@@ -1217,2 +1223,3 @@
 		      private:
 		        /// \brief Copy constructor.

test/graph_test.h

Show inline comments

@@ -214,6 +214,6 @@
 		    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[].");
 		    // }
+		  }
@@ -244,6 +244,6 @@
 		    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[].");
 		    // }
+		  }
@@ -274,6 +274,6 @@
 		    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