Merge bugfix #453 to branch 1.2 1.2
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 28 Nov 2012 12:02:36 +0100
branch1.2
changeset 11751fe3b4ad8caa
parent 1169 774349a16ba0
parent 1174 a26b90a17c81
child 1183 2c48ba00fccd
Merge bugfix #453 to branch 1.2
lemon/concepts/graph_components.h
test/dfs_test.cc
test/preflow_test.cc
     1.1 --- a/lemon/concepts/graph_components.h	Wed Nov 07 18:13:26 2012 +0100
     1.2 +++ b/lemon/concepts/graph_components.h	Wed Nov 28 12:02:36 2012 +0100
     1.3 @@ -108,6 +108,8 @@
     1.4            i1 = i2 = i3;
     1.5  
     1.6            bool b;
     1.7 +          ignore_unused_variable_warning(b);
     1.8 +
     1.9            b = (ia == ib) && (ia != ib);
    1.10            b = (ia == INVALID) && (ib != INVALID);
    1.11            b = (ia < ib);
     2.1 --- a/test/bellman_ford_test.cc	Wed Nov 07 18:13:26 2012 +0100
     2.2 +++ b/test/bellman_ford_test.cc	Wed Nov 28 12:02:36 2012 +0100
     2.3 @@ -65,8 +65,10 @@
     2.4    Node s, t, n;
     2.5    Arc e;
     2.6    Value l;
     2.7 +  ignore_unused_variable_warning(l);
     2.8    int k=3;
     2.9    bool b;
    2.10 +  ignore_unused_variable_warning(b);
    2.11    BF::DistMap d(gr);
    2.12    BF::PredMap p(gr);
    2.13    LengthMap length;
    2.14 @@ -147,6 +149,8 @@
    2.15  
    2.16    Digraph g;
    2.17    bool b;
    2.18 +  ignore_unused_variable_warning(b);
    2.19 +
    2.20    bellmanFord(g,LengthMap()).run(Node());
    2.21    b = bellmanFord(g,LengthMap()).run(Node(),Node());
    2.22    bellmanFord(g,LengthMap())
     3.1 --- a/test/bfs_test.cc	Wed Nov 07 18:13:26 2012 +0100
     3.2 +++ b/test/bfs_test.cc	Wed Nov 28 12:02:36 2012 +0100
     3.3 @@ -61,6 +61,7 @@
     3.4    Node s, t, n;
     3.5    Arc e;
     3.6    int l, i;
     3.7 +  ignore_unused_variable_warning(l,i);
     3.8    bool b;
     3.9    BType::DistMap d(G);
    3.10    BType::PredMap p(G);
    3.11 @@ -150,6 +151,8 @@
    3.12  
    3.13    Digraph g;
    3.14    bool b;
    3.15 +  ignore_unused_variable_warning(b);
    3.16 +
    3.17    bfs(g).run(Node());
    3.18    b=bfs(g).run(Node(),Node());
    3.19    bfs(g).run();
     4.1 --- a/test/circulation_test.cc	Wed Nov 07 18:13:26 2012 +0100
     4.2 +++ b/test/circulation_test.cc	Wed Nov 28 12:02:36 2012 +0100
     4.3 @@ -73,6 +73,7 @@
     4.4    BarrierMap bar;
     4.5    VType v;
     4.6    bool b;
     4.7 +  ignore_unused_variable_warning(v,b);
     4.8  
     4.9    typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
    4.10              ::SetFlowMap<FlowMap>
     5.1 --- a/test/dfs_test.cc	Wed Nov 07 18:13:26 2012 +0100
     5.2 +++ b/test/dfs_test.cc	Wed Nov 28 12:02:36 2012 +0100
     5.3 @@ -67,6 +67,8 @@
     5.4    Arc e;
     5.5    int l, i;
     5.6    bool b;
     5.7 +  ignore_unused_variable_warning(l,i,b);
     5.8 +
     5.9    DType::DistMap d(G);
    5.10    DType::PredMap p(G);
    5.11    Path<Digraph> pp;
    5.12 @@ -151,6 +153,8 @@
    5.13  
    5.14    Digraph g;
    5.15    bool b;
    5.16 +  ignore_unused_variable_warning(b);
    5.17 +
    5.18    dfs(g).run(Node());
    5.19    b=dfs(g).run(Node(),Node());
    5.20    dfs(g).run();
     6.1 --- a/test/dijkstra_test.cc	Wed Nov 07 18:13:26 2012 +0100
     6.2 +++ b/test/dijkstra_test.cc	Wed Nov 28 12:02:36 2012 +0100
     6.3 @@ -65,6 +65,8 @@
     6.4    VType l;
     6.5    int i;
     6.6    bool b;
     6.7 +  ignore_unused_variable_warning(l,i,b);
     6.8 +
     6.9    DType::DistMap d(G);
    6.10    DType::PredMap p(G);
    6.11    LengthMap length;
    6.12 @@ -162,6 +164,8 @@
    6.13  
    6.14    Digraph g;
    6.15    bool b;
    6.16 +  ignore_unused_variable_warning(b);
    6.17 +
    6.18    dijkstra(g,LengthMap()).run(Node());
    6.19    b=dijkstra(g,LengthMap()).run(Node(),Node());
    6.20    dijkstra(g,LengthMap())
     7.1 --- a/test/gomory_hu_test.cc	Wed Nov 07 18:13:26 2012 +0100
     7.2 +++ b/test/gomory_hu_test.cc	Wed Nov 28 12:02:36 2012 +0100
     7.3 @@ -68,6 +68,7 @@
     7.4    CutMap cut;
     7.5    Value v;
     7.6    int d;
     7.7 +  ignore_unused_variable_warning(v,d);
     7.8  
     7.9    GomoryHu<Graph, CapMap> gh_test(g, cap);
    7.10    const GomoryHu<Graph, CapMap>&
     8.1 --- a/test/hao_orlin_test.cc	Wed Nov 07 18:13:26 2012 +0100
     8.2 +++ b/test/hao_orlin_test.cc	Wed Nov 28 12:02:36 2012 +0100
     8.3 @@ -66,6 +66,7 @@
     8.4    CapMap cap;
     8.5    CutMap cut;
     8.6    Value v;
     8.7 +  ignore_unused_variable_warning(v);
     8.8  
     8.9    HaoOrlin<Digraph, CapMap> ho_test(g, cap);
    8.10    const HaoOrlin<Digraph, CapMap>&
     9.1 --- a/test/matching_test.cc	Wed Nov 07 18:13:26 2012 +0100
     9.2 +++ b/test/matching_test.cc	Wed Nov 28 12:02:36 2012 +0100
     9.3 @@ -145,6 +145,7 @@
     9.4  
     9.5    MaxMatching<Graph>::Status stat =
     9.6      const_mat_test.status(n);
     9.7 +  ignore_unused_variable_warning(stat);
     9.8    const MaxMatching<Graph>::StatusMap& smap =
     9.9      const_mat_test.statusMap();
    9.10    stat = smap[n];
    10.1 --- a/test/min_cost_arborescence_test.cc	Wed Nov 07 18:13:26 2012 +0100
    10.2 +++ b/test/min_cost_arborescence_test.cc	Wed Nov 28 12:02:36 2012 +0100
    10.3 @@ -91,6 +91,7 @@
    10.4    Arc e;
    10.5    VType c;
    10.6    bool b;
    10.7 +  ignore_unused_variable_warning(c,b);
    10.8    int i;
    10.9    CostMap cost;
   10.10    ArbMap arb;
    11.1 --- a/test/preflow_test.cc	Wed Nov 07 18:13:26 2012 +0100
    11.2 +++ b/test/preflow_test.cc	Wed Nov 28 12:02:36 2012 +0100
    11.3 @@ -86,6 +86,7 @@
    11.4    CutMap cut;
    11.5    VType v;
    11.6    bool b;
    11.7 +  ignore_unused_variable_warning(v,b);
    11.8  
    11.9    typedef Preflow<Digraph, CapMap>
   11.10              ::SetFlowMap<FlowMap>
    12.1 --- a/test/suurballe_test.cc	Wed Nov 07 18:13:26 2012 +0100
    12.2 +++ b/test/suurballe_test.cc	Wed Nov 28 12:02:36 2012 +0100
    12.3 @@ -117,6 +117,8 @@
    12.4  
    12.5    int f;
    12.6    VType c;
    12.7 +  ignore_unused_variable_warning(f,c);
    12.8 +
    12.9    c = const_suurb_test.totalLength();
   12.10    f = const_suurb_test.flow(e);
   12.11    const SuurballeType::FlowMap& fm =