1.1 --- a/lemon/bits/array_map.h Wed Sep 17 15:04:21 2008 +0100
1.2 +++ b/lemon/bits/array_map.h Wed Sep 17 15:04:38 2008 +0100
1.3 @@ -103,6 +103,7 @@
1.4 }
1.5 }
1.6
1.7 + private:
1.8 /// \brief Constructor to copy a map of the same map type.
1.9 ///
1.10 /// Constructor to copy a map of the same map type.
1.11 @@ -150,6 +151,7 @@
1.12 return *this;
1.13 }
1.14
1.15 + public:
1.16 /// \brief The destructor of the map.
1.17 ///
1.18 /// The destructor of the map.
2.1 --- a/lemon/bits/graph_extender.h Wed Sep 17 15:04:21 2008 +0100
2.2 +++ b/lemon/bits/graph_extender.h Wed Sep 17 15:04:38 2008 +0100
2.3 @@ -227,6 +227,7 @@
2.4 NodeMap(const Digraph& digraph, const _Value& value)
2.5 : Parent(digraph, value) {}
2.6
2.7 + private:
2.8 NodeMap& operator=(const NodeMap& cmap) {
2.9 return operator=<NodeMap>(cmap);
2.10 }
2.11 @@ -251,6 +252,7 @@
2.12 ArcMap(const Digraph& digraph, const _Value& value)
2.13 : Parent(digraph, value) {}
2.14
2.15 + private:
2.16 ArcMap& operator=(const ArcMap& cmap) {
2.17 return operator=<ArcMap>(cmap);
2.18 }
2.19 @@ -608,6 +610,7 @@
2.20 NodeMap(const Graph& graph, const _Value& value)
2.21 : Parent(graph, value) {}
2.22
2.23 + private:
2.24 NodeMap& operator=(const NodeMap& cmap) {
2.25 return operator=<NodeMap>(cmap);
2.26 }
2.27 @@ -632,6 +635,7 @@
2.28 ArcMap(const Graph& graph, const _Value& value)
2.29 : Parent(graph, value) {}
2.30
2.31 + private:
2.32 ArcMap& operator=(const ArcMap& cmap) {
2.33 return operator=<ArcMap>(cmap);
2.34 }
2.35 @@ -657,6 +661,7 @@
2.36 EdgeMap(const Graph& graph, const _Value& value)
2.37 : Parent(graph, value) {}
2.38
2.39 + private:
2.40 EdgeMap& operator=(const EdgeMap& cmap) {
2.41 return operator=<EdgeMap>(cmap);
2.42 }
3.1 --- a/lemon/bits/map_extender.h Wed Sep 17 15:04:21 2008 +0100
3.2 +++ b/lemon/bits/map_extender.h Wed Sep 17 15:04:38 2008 +0100
3.3 @@ -62,6 +62,7 @@
3.4 MapExtender(const Graph& graph, const Value& value)
3.5 : Parent(graph, value) {}
3.6
3.7 + private:
3.8 MapExtender& operator=(const MapExtender& cmap) {
3.9 return operator=<MapExtender>(cmap);
3.10 }
3.11 @@ -72,6 +73,7 @@
3.12 return *this;
3.13 }
3.14
3.15 + public:
3.16 class MapIt : public Item {
3.17 public:
3.18
3.19 @@ -200,6 +202,7 @@
3.20 SubMapExtender(const Graph& _graph, const Value& _value)
3.21 : Parent(_graph, _value), graph(_graph) {}
3.22
3.23 + private:
3.24 SubMapExtender& operator=(const SubMapExtender& cmap) {
3.25 return operator=<MapExtender>(cmap);
3.26 }
3.27 @@ -214,6 +217,7 @@
3.28 return *this;
3.29 }
3.30
3.31 + public:
3.32 class MapIt : public Item {
3.33 public:
3.34
4.1 --- a/lemon/bits/vector_map.h Wed Sep 17 15:04:21 2008 +0100
4.2 +++ b/lemon/bits/vector_map.h Wed Sep 17 15:04:38 2008 +0100
4.3 @@ -100,6 +100,7 @@
4.4 container.resize(Parent::notifier()->maxId() + 1, value);
4.5 }
4.6
4.7 + private:
4.8 /// \brief Copy constructor
4.9 ///
4.10 /// Copy constructor.
5.1 --- a/lemon/concepts/digraph.h Wed Sep 17 15:04:21 2008 +0100
5.2 +++ b/lemon/concepts/digraph.h Wed Sep 17 15:04:38 2008 +0100
5.3 @@ -434,6 +434,7 @@
5.4 ///\e
5.5 NodeMap(const Digraph&, T) { }
5.6
5.7 + private:
5.8 ///Copy constructor
5.9 NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
5.10 ///Assignment operator
5.11 @@ -456,6 +457,7 @@
5.12 ArcMap(const Digraph&) { }
5.13 ///\e
5.14 ArcMap(const Digraph&, T) { }
5.15 + private:
5.16 ///Copy constructor
5.17 ArcMap(const ArcMap& em) : ReadWriteMap<Arc,T>(em) { }
5.18 ///Assignment operator
6.1 --- a/lemon/concepts/graph.h Wed Sep 17 15:04:21 2008 +0100
6.2 +++ b/lemon/concepts/graph.h Wed Sep 17 15:04:38 2008 +0100
6.3 @@ -512,6 +512,7 @@
6.4 ///\e
6.5 NodeMap(const Graph&, T) { }
6.6
6.7 + private:
6.8 ///Copy constructor
6.9 NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
6.10 ///Assignment operator
6.11 @@ -535,6 +536,7 @@
6.12 ArcMap(const Graph&) { }
6.13 ///\e
6.14 ArcMap(const Graph&, T) { }
6.15 + private:
6.16 ///Copy constructor
6.17 ArcMap(const ArcMap& em) : ReadWriteMap<Arc,T>(em) { }
6.18 ///Assignment operator
6.19 @@ -558,6 +560,7 @@
6.20 EdgeMap(const Graph&) { }
6.21 ///\e
6.22 EdgeMap(const Graph&, T) { }
6.23 + private:
6.24 ///Copy constructor
6.25 EdgeMap(const EdgeMap& em) : ReadWriteMap<Edge,T>(em) {}
6.26 ///Assignment operator
7.1 --- a/lemon/concepts/graph_components.h Wed Sep 17 15:04:21 2008 +0100
7.2 +++ b/lemon/concepts/graph_components.h Wed Sep 17 15:04:38 2008 +0100
7.3 @@ -1005,6 +1005,8 @@
7.4 ///
7.5 /// Construct a new map for the graph and initalise the values.
7.6 GraphMap(const Graph&, const Value&) {}
7.7 +
7.8 + private:
7.9 /// \brief Copy constructor.
7.10 ///
7.11 /// Copy Constructor.
7.12 @@ -1021,6 +1023,7 @@
7.13 return *this;
7.14 }
7.15
7.16 + public:
7.17 template<typename _Map>
7.18 struct Constraints {
7.19 void constraints() {
7.20 @@ -1030,13 +1033,14 @@
7.21 // Constructor with a graph and a default value parameter
7.22 _Map a2(g,t);
7.23 // Copy constructor.
7.24 - _Map b(c);
7.25 + // _Map b(c);
7.26
7.27 - ReadMap<Key, Value> cmap;
7.28 - b = cmap;
7.29 + // ReadMap<Key, Value> cmap;
7.30 + // b = cmap;
7.31
7.32 + ignore_unused_variable_warning(a);
7.33 ignore_unused_variable_warning(a2);
7.34 - ignore_unused_variable_warning(b);
7.35 + // ignore_unused_variable_warning(b);
7.36 }
7.37
7.38 const _Map &c;
7.39 @@ -1082,6 +1086,7 @@
7.40 NodeMap(const MappableDigraphComponent& digraph, const _Value& value)
7.41 : Parent(digraph, value) {}
7.42
7.43 + private:
7.44 /// \brief Copy constructor.
7.45 ///
7.46 /// Copy Constructor.
7.47 @@ -1119,6 +1124,7 @@
7.48 ArcMap(const MappableDigraphComponent& digraph, const _Value& value)
7.49 : Parent(digraph, value) {}
7.50
7.51 + private:
7.52 /// \brief Copy constructor.
7.53 ///
7.54 /// Copy Constructor.
7.55 @@ -1215,6 +1221,7 @@
7.56 EdgeMap(const MappableGraphComponent& graph, const _Value& value)
7.57 : Parent(graph, value) {}
7.58
7.59 + private:
7.60 /// \brief Copy constructor.
7.61 ///
7.62 /// Copy Constructor.
8.1 --- a/test/graph_test.h Wed Sep 17 15:04:21 2008 +0100
8.2 +++ b/test/graph_test.h Wed Sep 17 15:04:38 2008 +0100
8.3 @@ -212,10 +212,10 @@
8.4 }
8.5 check(s == 0, "Wrong sum.");
8.6
8.7 - map = constMap<Node>(12);
8.8 - for (NodeIt it(G); it != INVALID; ++it) {
8.9 - check(map[it] == 12, "Wrong operator[].");
8.10 - }
8.11 + // map = constMap<Node>(12);
8.12 + // for (NodeIt it(G); it != INVALID; ++it) {
8.13 + // check(map[it] == 12, "Wrong operator[].");
8.14 + // }
8.15 }
8.16
8.17 template <typename Graph>
8.18 @@ -242,10 +242,10 @@
8.19 }
8.20 check(s == 0, "Wrong sum.");
8.21
8.22 - map = constMap<Arc>(12);
8.23 - for (ArcIt it(G); it != INVALID; ++it) {
8.24 - check(map[it] == 12, "Wrong operator[].");
8.25 - }
8.26 + // map = constMap<Arc>(12);
8.27 + // for (ArcIt it(G); it != INVALID; ++it) {
8.28 + // check(map[it] == 12, "Wrong operator[].");
8.29 + // }
8.30 }
8.31
8.32 template <typename Graph>
8.33 @@ -272,10 +272,10 @@
8.34 }
8.35 check(s == 0, "Wrong sum.");
8.36
8.37 - map = constMap<Edge>(12);
8.38 - for (EdgeIt it(G); it != INVALID; ++it) {
8.39 - check(map[it] == 12, "Wrong operator[].");
8.40 - }
8.41 + // map = constMap<Edge>(12);
8.42 + // for (EdgeIt it(G); it != INVALID; ++it) {
8.43 + // check(map[it] == 12, "Wrong operator[].");
8.44 + // }
8.45 }
8.46
8.47