Merge #449
authorAlpar Juttner <alpar@cs.elte.hu>
Thu, 13 Sep 2012 12:13:19 +0200
changeset 1000404b98971e1f
parent 996 b6347aae6575
parent 999 00f8d9f9920d
child 1001 e344f0887c59
Merge #449
CMakeLists.txt
lemon/bits/edge_set_extender.h
lemon/cbc.cc
lemon/concepts/graph_components.h
lemon/core.h
lemon/dfs.h
lemon/path.h
test/CMakeLists.txt
     1.1 --- a/lemon/adaptors.h	Wed Sep 12 17:34:01 2012 +0200
     1.2 +++ b/lemon/adaptors.h	Thu Sep 13 12:13:19 2012 +0200
     1.3 @@ -1371,7 +1371,7 @@
     1.4      /// Creates a subgraph for the given graph with the given node
     1.5      /// and edge filter maps.
     1.6      SubGraph(GR& graph, NF& node_filter, EF& edge_filter) {
     1.7 -      initialize(graph, node_filter, edge_filter);
     1.8 +      this->initialize(graph, node_filter, edge_filter);
     1.9      }
    1.10  
    1.11      /// \brief Sets the status of the given node
    1.12 @@ -2277,7 +2277,7 @@
    1.13      ///
    1.14      /// Creates an undirected graph from the given digraph.
    1.15      Undirector(DGR& digraph) {
    1.16 -      initialize(digraph);
    1.17 +      this->initialize(digraph);
    1.18      }
    1.19  
    1.20      /// \brief Arc map combined from two original arc maps
     2.1 --- a/lemon/bits/bezier.h	Wed Sep 12 17:34:01 2012 +0200
     2.2 +++ b/lemon/bits/bezier.h	Thu Sep 13 12:13:19 2012 +0200
     2.3 @@ -159,7 +159,7 @@
     2.4      const Point c=(p3+p4)/2;
     2.5      const Point d=(a+b)/2;
     2.6      const Point e=(b+c)/2;
     2.7 -    const Point f=(d+e)/2;
     2.8 +    // const Point f=(d+e)/2;
     2.9      R f1=_f(Bezier3(p1,a,d,e),_d);
    2.10      R f2=_f(Bezier3(e,d,c,p4),_d);
    2.11      return _s(f1,f2);
     3.1 --- a/lemon/bits/edge_set_extender.h	Wed Sep 12 17:34:01 2012 +0200
     3.2 +++ b/lemon/bits/edge_set_extender.h	Thu Sep 13 12:13:19 2012 +0200
     3.3 @@ -523,13 +523,13 @@
     3.4      //
     3.5      // Returns the base node of the iterator
     3.6      Node baseNode(const IncEdgeIt &e) const {
     3.7 -      return e.direction ? u(e) : v(e);
     3.8 +      return e.direction ? this->u(e) : this->v(e);
     3.9      }
    3.10      // Running node of the iterator
    3.11      //
    3.12      // Returns the running node of the iterator
    3.13      Node runningNode(const IncEdgeIt &e) const {
    3.14 -      return e.direction ? v(e) : u(e);
    3.15 +      return e.direction ? this->v(e) : this->u(e);
    3.16      }
    3.17  
    3.18  
     4.1 --- a/lemon/bits/graph_extender.h	Wed Sep 12 17:34:01 2012 +0200
     4.2 +++ b/lemon/bits/graph_extender.h	Thu Sep 13 12:13:19 2012 +0200
     4.3 @@ -587,13 +587,13 @@
     4.4      //
     4.5      // Returns the base node of the iterator
     4.6      Node baseNode(const IncEdgeIt &edge) const {
     4.7 -      return edge._direction ? u(edge) : v(edge);
     4.8 +      return edge._direction ? this->u(edge) : this->v(edge);
     4.9      }
    4.10      // Running node of the iterator
    4.11      //
    4.12      // Returns the running node of the iterator
    4.13      Node runningNode(const IncEdgeIt &edge) const {
    4.14 -      return edge._direction ? v(edge) : u(edge);
    4.15 +      return edge._direction ? this->v(edge) : this->u(edge);
    4.16      }
    4.17  
    4.18      // Mappable extension
     5.1 --- a/lemon/circulation.h	Wed Sep 12 17:34:01 2012 +0200
     5.2 +++ b/lemon/circulation.h	Thu Sep 13 12:13:19 2012 +0200
     5.3 @@ -572,8 +572,6 @@
     5.4      {
     5.5  
     5.6        Node act;
     5.7 -      Node bact=INVALID;
     5.8 -      Node last_activated=INVALID;
     5.9        while((act=_level->highestActive())!=INVALID) {
    5.10          int actlevel=(*_level)[act];
    5.11          int mlevel=_node_num;
     6.1 --- a/lemon/concept_check.h	Wed Sep 12 17:34:01 2012 +0200
     6.2 +++ b/lemon/concept_check.h	Thu Sep 13 12:13:19 2012 +0200
     6.3 @@ -35,6 +35,22 @@
     6.4    */
     6.5  
     6.6    template <class T> inline void ignore_unused_variable_warning(const T&) { }
     6.7 +  template <class T1, class T2>
     6.8 +  inline void ignore_unused_variable_warning(const T1&, const T2&) { }
     6.9 +  template <class T1, class T2, class T3>
    6.10 +  inline void ignore_unused_variable_warning(const T1&, const T2&,
    6.11 +                                             const T3&) { }
    6.12 +  template <class T1, class T2, class T3, class T4>
    6.13 +  inline void ignore_unused_variable_warning(const T1&, const T2&,
    6.14 +                                             const T3&, const T4&) { }
    6.15 +  template <class T1, class T2, class T3, class T4, class T5>
    6.16 +  inline void ignore_unused_variable_warning(const T1&, const T2&,
    6.17 +                                             const T3&, const T4&,
    6.18 +                                             const T5&) { }
    6.19 +  template <class T1, class T2, class T3, class T4, class T5, class T6>
    6.20 +  inline void ignore_unused_variable_warning(const T1&, const T2&,
    6.21 +                                             const T3&, const T4&,
    6.22 +                                             const T5&, const T6&) { }
    6.23  
    6.24    ///\e
    6.25    template <class Concept>
     7.1 --- a/lemon/concepts/graph_components.h	Wed Sep 12 17:34:01 2012 +0200
     7.2 +++ b/lemon/concepts/graph_components.h	Thu Sep 13 12:13:19 2012 +0200
     7.3 @@ -494,6 +494,8 @@
     7.4            _GraphItemIt it2;
     7.5            _GraphItemIt it3 = it1;
     7.6            _GraphItemIt it4 = INVALID;
     7.7 +          ignore_unused_variable_warning(it3);
     7.8 +          ignore_unused_variable_warning(it4);
     7.9  
    7.10            it2 = ++it1;
    7.11            ++it2 = it1;
    7.12 @@ -583,6 +585,8 @@
    7.13            _GraphIncIt it2;
    7.14            _GraphIncIt it3 = it1;
    7.15            _GraphIncIt it4 = INVALID;
    7.16 +          ignore_unused_variable_warning(it3);
    7.17 +          ignore_unused_variable_warning(it4);
    7.18  
    7.19            it2 = ++it1;
    7.20            ++it2 = it1;
     8.1 --- a/lemon/concepts/maps.h	Wed Sep 12 17:34:01 2012 +0200
     8.2 +++ b/lemon/concepts/maps.h	Thu Sep 13 12:13:19 2012 +0200
     8.3 @@ -49,7 +49,7 @@
     8.4  
     8.5        /// Returns the value associated with the given key.
     8.6        Value operator[](const Key &) const {
     8.7 -        return *static_cast<Value *>(0);
     8.8 +        return *(static_cast<Value *>(0)+1);
     8.9        }
    8.10  
    8.11        template<typename _ReadMap>
     9.1 --- a/lemon/graph_to_eps.h	Wed Sep 12 17:34:01 2012 +0200
     9.2 +++ b/lemon/graph_to_eps.h	Thu Sep 13 12:13:19 2012 +0200
     9.3 @@ -222,7 +222,7 @@
     9.4    using T::_title;
     9.5    using T::_copyright;
     9.6  
     9.7 -  using T::NodeTextColorType;
     9.8 +  using typename T::NodeTextColorType;
     9.9    using T::CUST_COL;
    9.10    using T::DIST_COL;
    9.11    using T::DIST_BW;
    10.1 --- a/lemon/planarity.h	Wed Sep 12 17:34:01 2012 +0200
    10.2 +++ b/lemon/planarity.h	Thu Sep 13 12:13:19 2012 +0200
    10.3 @@ -72,7 +72,6 @@
    10.4        }
    10.5  
    10.6        void discover(const Arc& arc) {
    10.7 -        Node source = _graph.source(arc);
    10.8          Node target = _graph.target(arc);
    10.9  
   10.10          _tree_map[arc] = true;
    11.1 --- a/test/adaptors_test.cc	Wed Sep 12 17:34:01 2012 +0200
    11.2 +++ b/test/adaptors_test.cc	Thu Sep 13 12:13:19 2012 +0200
    11.3 @@ -65,6 +65,7 @@
    11.4    Digraph::Arc a1 = digraph.addArc(n1, n2);
    11.5    Digraph::Arc a2 = digraph.addArc(n1, n3);
    11.6    Digraph::Arc a3 = digraph.addArc(n2, n3);
    11.7 +  ignore_unused_variable_warning(a3);
    11.8  
    11.9    // Check the adaptor
   11.10    checkGraphNodeList(adaptor, 3);
   11.11 @@ -99,6 +100,7 @@
   11.12    Adaptor::Arc a6 = adaptor.addArc(n2, n4);
   11.13    Adaptor::Arc a7 = adaptor.addArc(n1, n4);
   11.14    Adaptor::Arc a8 = adaptor.addArc(n1, n2);
   11.15 +  ignore_unused_variable_warning(a6,a7,a8);
   11.16  
   11.17    adaptor.erase(a1);
   11.18    adaptor.erase(n3);
   11.19 @@ -758,6 +760,7 @@
   11.20    Digraph::Arc a1 = digraph.addArc(n1, n2);
   11.21    Digraph::Arc a2 = digraph.addArc(n1, n3);
   11.22    Digraph::Arc a3 = digraph.addArc(n2, n3);
   11.23 +  ignore_unused_variable_warning(a1,a2,a3);
   11.24  
   11.25    checkGraphNodeList(adaptor, 6);
   11.26    checkGraphArcList(adaptor, 6);
    12.1 --- a/test/bellman_ford_test.cc	Wed Sep 12 17:34:01 2012 +0200
    12.2 +++ b/test/bellman_ford_test.cc	Thu Sep 13 12:13:19 2012 +0200
    12.3 @@ -190,7 +190,7 @@
    12.4    check(pathTarget(gr, p) == t, "path() found a wrong path.");
    12.5  
    12.6    ListPath<Digraph> path;
    12.7 -  Value dist;
    12.8 +  Value dist = 0;
    12.9    bool reached = bellmanFord(gr,length).path(path).dist(dist).run(s,t);
   12.10  
   12.11    check(reached && dist == -1, "Bellman-Ford found a wrong path.");
    13.1 --- a/test/connectivity_test.cc	Wed Sep 12 17:34:01 2012 +0200
    13.2 +++ b/test/connectivity_test.cc	Thu Sep 13 12:13:19 2012 +0200
    13.3 @@ -68,6 +68,7 @@
    13.4      Digraph::NodeMap<int> order(d);
    13.5      Graph g(d);
    13.6      Digraph::Node n = d.addNode();
    13.7 +    ignore_unused_variable_warning(n);
    13.8  
    13.9      check(stronglyConnected(d), "This digraph is strongly connected");
   13.10      check(countStronglyConnectedComponents(d) == 1,
   13.11 @@ -245,6 +246,7 @@
   13.12      Digraph::Node shoe = d.addNode();
   13.13      Digraph::Node watch = d.addNode();
   13.14      Digraph::Node pants = d.addNode();
   13.15 +    ignore_unused_variable_warning(watch);
   13.16  
   13.17      d.addArc(socks, shoe);
   13.18      d.addArc(pants, shoe);
    14.1 --- a/test/digraph_test.cc	Wed Sep 12 17:34:01 2012 +0200
    14.2 +++ b/test/digraph_test.cc	Thu Sep 13 12:13:19 2012 +0200
    14.3 @@ -64,6 +64,7 @@
    14.4    Arc a2 = G.addArc(n2, n1),
    14.5        a3 = G.addArc(n2, n3),
    14.6        a4 = G.addArc(n2, n3);
    14.7 +  ignore_unused_variable_warning(a2,a3,a4);
    14.8  
    14.9    checkGraphNodeList(G, 3);
   14.10    checkGraphArcList(G, 4);
   14.11 @@ -92,6 +93,7 @@
   14.12    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   14.13    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
   14.14        a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
   14.15 +  ignore_unused_variable_warning(a1,a2,a3,a4);
   14.16  
   14.17    Node n4 = G.split(n2);
   14.18  
   14.19 @@ -125,6 +127,7 @@
   14.20    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
   14.21        a3 = G.addArc(n4, n3), a4 = G.addArc(n4, n3),
   14.22        a5 = G.addArc(n2, n4);
   14.23 +  ignore_unused_variable_warning(a1,a2,a3,a5);
   14.24  
   14.25    checkGraphNodeList(G, 4);
   14.26    checkGraphArcList(G, 5);
   14.27 @@ -204,6 +207,7 @@
   14.28    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
   14.29        a3 = G.addArc(n4, n3), a4 = G.addArc(n3, n1),
   14.30        a5 = G.addArc(n2, n4);
   14.31 +  ignore_unused_variable_warning(a2,a3,a4,a5);
   14.32  
   14.33    // Check arc deletion
   14.34    G.erase(a1);
   14.35 @@ -251,6 +255,7 @@
   14.36    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   14.37    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
   14.38        a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
   14.39 +  ignore_unused_variable_warning(a1,a2,a3,a4);
   14.40  
   14.41    typename Digraph::Snapshot snapshot(G);
   14.42  
   14.43 @@ -351,6 +356,7 @@
   14.44    Arc
   14.45      e1 = g.addArc(n1, n2),
   14.46      e2 = g.addArc(n2, n3);
   14.47 +  ignore_unused_variable_warning(e2);
   14.48  
   14.49    check(g.valid(n1), "Wrong validity check");
   14.50    check(g.valid(e1), "Wrong validity check");
   14.51 @@ -436,6 +442,7 @@
   14.52      a2 = g.addArc(n2, n1),
   14.53      a3 = g.addArc(n2, n3),
   14.54      a4 = g.addArc(n2, n3);
   14.55 +  ignore_unused_variable_warning(a2,a3,a4);
   14.56  
   14.57    digraphCopy(g, G).nodeRef(nref).run();
   14.58  
    15.1 --- a/test/edge_set_test.cc	Wed Sep 12 17:34:01 2012 +0200
    15.2 +++ b/test/edge_set_test.cc	Thu Sep 13 12:13:19 2012 +0200
    15.3 @@ -44,10 +44,12 @@
    15.4      n2 = digraph.addNode();
    15.5  
    15.6    Digraph::Arc ga1 = digraph.addArc(n1, n2);
    15.7 +  ignore_unused_variable_warning(ga1);
    15.8  
    15.9    ArcSet arc_set(digraph);
   15.10  
   15.11    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.12 +  ignore_unused_variable_warning(ga2);
   15.13  
   15.14    checkGraphNodeList(arc_set, 2);
   15.15    checkGraphArcList(arc_set, 0);
   15.16 @@ -75,6 +77,8 @@
   15.17    ArcSet::Arc a2 = arc_set.addArc(n2, n1),
   15.18      a3 = arc_set.addArc(n2, n3),
   15.19      a4 = arc_set.addArc(n2, n3);
   15.20 +  ignore_unused_variable_warning(a2,a3,a4);
   15.21 +
   15.22    checkGraphNodeList(arc_set, 3);
   15.23    checkGraphArcList(arc_set, 4);
   15.24  
   15.25 @@ -110,10 +114,12 @@
   15.26      n2 = digraph.addNode();
   15.27  
   15.28    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   15.29 +  ignore_unused_variable_warning(ga1);
   15.30  
   15.31    ArcSet arc_set(digraph);
   15.32  
   15.33    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.34 +  ignore_unused_variable_warning(ga2);
   15.35  
   15.36    checkGraphNodeList(arc_set, 2);
   15.37    checkGraphArcList(arc_set, 0);
   15.38 @@ -141,6 +147,8 @@
   15.39    ArcSet::Arc a2 = arc_set.addArc(n2, n1),
   15.40      a3 = arc_set.addArc(n2, n3),
   15.41      a4 = arc_set.addArc(n2, n3);
   15.42 +  ignore_unused_variable_warning(a2,a3,a4);
   15.43 +
   15.44    checkGraphNodeList(arc_set, 3);
   15.45    checkGraphArcList(arc_set, 4);
   15.46  
   15.47 @@ -190,10 +198,12 @@
   15.48      n2 = digraph.addNode();
   15.49  
   15.50    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   15.51 +  ignore_unused_variable_warning(ga1);
   15.52  
   15.53    EdgeSet edge_set(digraph);
   15.54  
   15.55    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.56 +  ignore_unused_variable_warning(ga2);
   15.57  
   15.58    checkGraphNodeList(edge_set, 2);
   15.59    checkGraphArcList(edge_set, 0);
   15.60 @@ -230,6 +240,8 @@
   15.61    EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
   15.62      e3 = edge_set.addEdge(n2, n3),
   15.63      e4 = edge_set.addEdge(n2, n3);
   15.64 +  ignore_unused_variable_warning(e2,e3,e4);
   15.65 +
   15.66    checkGraphNodeList(edge_set, 3);
   15.67    checkGraphEdgeList(edge_set, 4);
   15.68  
   15.69 @@ -274,10 +286,12 @@
   15.70      n2 = digraph.addNode();
   15.71  
   15.72    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   15.73 +  ignore_unused_variable_warning(ga1);
   15.74  
   15.75    EdgeSet edge_set(digraph);
   15.76  
   15.77    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.78 +  ignore_unused_variable_warning(ga2);
   15.79  
   15.80    checkGraphNodeList(edge_set, 2);
   15.81    checkGraphArcList(edge_set, 0);
   15.82 @@ -314,6 +328,8 @@
   15.83    EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
   15.84      e3 = edge_set.addEdge(n2, n3),
   15.85      e4 = edge_set.addEdge(n2, n3);
   15.86 +  ignore_unused_variable_warning(e2,e3,e4);
   15.87 +
   15.88    checkGraphNodeList(edge_set, 3);
   15.89    checkGraphEdgeList(edge_set, 4);
   15.90  
    16.1 --- a/test/euler_test.cc	Wed Sep 12 17:34:01 2012 +0200
    16.2 +++ b/test/euler_test.cc	Thu Sep 13 12:13:19 2012 +0200
    16.3 @@ -101,7 +101,8 @@
    16.4      Digraph d;
    16.5      Graph g(d);
    16.6      Digraph::Node n = d.addNode();
    16.7 -
    16.8 +    ignore_unused_variable_warning(n);
    16.9 +  
   16.10      checkDiEulerIt(d);
   16.11      checkDiEulerIt(g);
   16.12      checkEulerIt(g);
   16.13 @@ -189,6 +190,7 @@
   16.14      Digraph::Node n3 = d.addNode();
   16.15      Digraph::Node n4 = d.addNode();
   16.16      Digraph::Node n5 = d.addNode();
   16.17 +    ignore_unused_variable_warning(n0,n4,n5);
   16.18  
   16.19      d.addArc(n1, n2);
   16.20      d.addArc(n2, n3);
    17.1 --- a/test/fractional_matching_test.cc	Wed Sep 12 17:34:01 2012 +0200
    17.2 +++ b/test/fractional_matching_test.cc	Thu Sep 13 12:13:19 2012 +0200
    17.3 @@ -342,6 +342,7 @@
    17.4        check(indeg == 1, "Invalid matching");
    17.5        pv += weight[mwfm.matching(n)];
    17.6        SmartGraph::Node o = graph.target(mwfm.matching(n));
    17.7 +      ignore_unused_variable_warning(o);
    17.8      } else {
    17.9        check(mwfm.nodeValue(n) == 0, "Invalid matching");
   17.10        check(indeg == 0, "Invalid matching");
   17.11 @@ -406,6 +407,7 @@
   17.12      check(indeg == 1, "Invalid perfect matching");
   17.13      pv += weight[mwpfm.matching(n)];
   17.14      SmartGraph::Node o = graph.target(mwpfm.matching(n));
   17.15 +    ignore_unused_variable_warning(o);
   17.16    }
   17.17  
   17.18    for (SmartGraph::EdgeIt e(graph); e != INVALID; ++e) {
    18.1 --- a/test/graph_test.cc	Wed Sep 12 17:34:01 2012 +0200
    18.2 +++ b/test/graph_test.cc	Thu Sep 13 12:13:19 2012 +0200
    18.3 @@ -66,6 +66,7 @@
    18.4  
    18.5    Edge e2 = G.addEdge(n2, n1),
    18.6         e3 = G.addEdge(n2, n3);
    18.7 +  ignore_unused_variable_warning(e2,e3);
    18.8  
    18.9    checkGraphNodeList(G, 3);
   18.10    checkGraphEdgeList(G, 3);
   18.11 @@ -98,6 +99,7 @@
   18.12    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   18.13         e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
   18.14         e5 = G.addEdge(n4, n3);
   18.15 +  ignore_unused_variable_warning(e1,e3,e4,e5);
   18.16  
   18.17    checkGraphNodeList(G, 4);
   18.18    checkGraphEdgeList(G, 5);
   18.19 @@ -177,6 +179,7 @@
   18.20    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   18.21         e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
   18.22         e5 = G.addEdge(n4, n3);
   18.23 +  ignore_unused_variable_warning(e1,e3,e4,e5);
   18.24  
   18.25    // Check edge deletion
   18.26    G.erase(e2);
   18.27 @@ -217,6 +220,7 @@
   18.28    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   18.29    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   18.30         e3 = G.addEdge(n2, n3);
   18.31 +  ignore_unused_variable_warning(e1,e2,e3);
   18.32  
   18.33    checkGraphNodeList(G, 3);
   18.34    checkGraphEdgeList(G, 3);
   18.35 @@ -381,6 +385,7 @@
   18.36    Edge
   18.37      e1 = g.addEdge(n1, n2),
   18.38      e2 = g.addEdge(n2, n3);
   18.39 +  ignore_unused_variable_warning(e2);
   18.40  
   18.41    check(g.valid(n1), "Wrong validity check");
   18.42    check(g.valid(e1), "Wrong validity check");
   18.43 @@ -519,6 +524,7 @@
   18.44    checkGraphArcList(G, dim * (1 << dim));
   18.45  
   18.46    Node n = G.nodeFromId(dim);
   18.47 +  ignore_unused_variable_warning(n);
   18.48  
   18.49    for (NodeIt n(G); n != INVALID; ++n) {
   18.50      checkGraphIncEdgeList(G, n, dim);
    19.1 --- a/test/maps_test.cc	Wed Sep 12 17:34:01 2012 +0200
    19.2 +++ b/test/maps_test.cc	Thu Sep 13 12:13:19 2012 +0200
    19.3 @@ -103,6 +103,7 @@
    19.4      checkConcept<ReadWriteMap<A,B>, NullMap<A,B> >();
    19.5      NullMap<A,B> map1;
    19.6      NullMap<A,B> map2 = map1;
    19.7 +    ignore_unused_variable_warning(map2);
    19.8      map1 = nullMap<A,B>();
    19.9    }
   19.10  
   19.11 @@ -113,11 +114,15 @@
   19.12      ConstMap<A,B> map1;
   19.13      ConstMap<A,B> map2 = B();
   19.14      ConstMap<A,B> map3 = map1;
   19.15 +    ignore_unused_variable_warning(map2,map3);
   19.16 +
   19.17      map1 = constMap<A>(B());
   19.18      map1 = constMap<A,B>();
   19.19      map1.setAll(B());
   19.20      ConstMap<A,C> map4(C(1));
   19.21      ConstMap<A,C> map5 = map4;
   19.22 +    ignore_unused_variable_warning(map5);
   19.23 +
   19.24      map4 = constMap<A>(C(2));
   19.25      map4.setAll(C(3));
   19.26  
   19.27 @@ -138,6 +143,8 @@
   19.28      checkConcept<ReadMap<A,A>, IdentityMap<A> >();
   19.29      IdentityMap<A> map1;
   19.30      IdentityMap<A> map2 = map1;
   19.31 +    ignore_unused_variable_warning(map2);
   19.32 +
   19.33      map1 = identityMap<A>();
   19.34  
   19.35      checkConcept<ReadMap<double,double>, IdentityMap<double> >();
   19.36 @@ -197,7 +204,9 @@
   19.37      typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
   19.38      checkConcept<ReadMap<B,double>, CompMap>();
   19.39      CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
   19.40 +    ignore_unused_variable_warning(map1);
   19.41      CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
   19.42 +    ignore_unused_variable_warning(map2);
   19.43  
   19.44      SparseMap<double, bool> m1(false); m1[3.14] = true;
   19.45      RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
   19.46 @@ -210,7 +219,9 @@
   19.47      typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
   19.48      checkConcept<ReadMap<A,double>, CombMap>();
   19.49      CombMap map1 = CombMap(DoubleMap(), DoubleMap());
   19.50 +    ignore_unused_variable_warning(map1);
   19.51      CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
   19.52 +    ignore_unused_variable_warning(map2);
   19.53  
   19.54      check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
   19.55            "Something is wrong with CombineMap");
   19.56 @@ -222,11 +233,15 @@
   19.57      checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
   19.58      FunctorToMap<F> map1;
   19.59      FunctorToMap<F> map2 = FunctorToMap<F>(F());
   19.60 +    ignore_unused_variable_warning(map2);
   19.61 +
   19.62      B b = functorToMap(F())[A()];
   19.63 +    ignore_unused_variable_warning(b);
   19.64  
   19.65      checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
   19.66      MapToFunctor<ReadMap<A,B> > map =
   19.67        MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
   19.68 +    ignore_unused_variable_warning(map);
   19.69  
   19.70      check(functorToMap(&func)[A()] == 3,
   19.71            "Something is wrong with FunctorToMap");
   19.72 @@ -244,7 +259,10 @@
   19.73      checkConcept<ReadMap<double,double>,
   19.74        ConvertMap<ReadMap<double, int>, double> >();
   19.75      ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
   19.76 +    ignore_unused_variable_warning(map1);
   19.77      ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
   19.78 +    ignore_unused_variable_warning(map2);
   19.79 +
   19.80    }
   19.81  
   19.82    // ForkMap
    20.1 --- a/test/time_measure_test.cc	Wed Sep 12 17:34:01 2012 +0200
    20.2 +++ b/test/time_measure_test.cc	Thu Sep 13 12:13:19 2012 +0200
    20.3 @@ -17,6 +17,7 @@
    20.4   */
    20.5  
    20.6  #include <lemon/time_measure.h>
    20.7 +#include <lemon/concept_check.h>
    20.8  
    20.9  using namespace lemon;
   20.10  
   20.11 @@ -32,7 +33,10 @@
   20.12    static Timer T;
   20.13  
   20.14    for(int i=0;i<1000;i++)
   20.15 -    TimeStamp x(T);
   20.16 +    {
   20.17 +      TimeStamp x(T);
   20.18 +      ignore_unused_variable_warning(x);
   20.19 +    }
   20.20  }
   20.21  
   20.22  int main()