Merge bugfix #471 and #472 to branch 1.3 1.3
authorAlpar Juttner <alpar@cs.elte.hu>
Sun, 11 Aug 2013 22:32:16 +0200
branch1.3
changeset 1293bc0fc7384c50
parent 1287 fbb7ddd13c8b
parent 1292 688a55e4c878
child 1295 f70d8f5a1a5d
Merge bugfix #471 and #472 to branch 1.3
     1.1 --- a/lemon/graph_to_eps.h	Sun Aug 11 15:31:02 2013 +0200
     1.2 +++ b/lemon/graph_to_eps.h	Sun Aug 11 22:32:16 2013 +0200
     1.3 @@ -222,7 +222,6 @@
     1.4    using T::_title;
     1.5    using T::_copyright;
     1.6  
     1.7 -  using T::NodeTextColorType;
     1.8    using T::CUST_COL;
     1.9    using T::DIST_COL;
    1.10    using T::DIST_BW;
     2.1 --- a/test/bpgraph_test.cc	Sun Aug 11 15:31:02 2013 +0200
     2.2 +++ b/test/bpgraph_test.cc	Sun Aug 11 22:32:16 2013 +0200
     2.3 @@ -78,6 +78,7 @@
     2.4    Edge
     2.5      e2 = G.addEdge(bn1, rn1),
     2.6      e3 = G.addEdge(rn1, bn2);
     2.7 +  ::lemon::ignore_unused_variable_warning(e2,e3);
     2.8  
     2.9    checkGraphNodeList(G, 3);
    2.10    checkGraphRedNodeList(G, 1);
    2.11 @@ -119,6 +120,7 @@
    2.12    Edge
    2.13      e1 = G.addEdge(n1, n2), e2 = G.addEdge(n1, n3),
    2.14      e3 = G.addEdge(n4, n2), e4 = G.addEdge(n4, n3);
    2.15 +  ::lemon::ignore_unused_variable_warning(e1,e3,e4);
    2.16  
    2.17    // Check edge deletion
    2.18    G.erase(e2);
    2.19 @@ -167,6 +169,7 @@
    2.20    Edge
    2.21      e1 = G.addEdge(n1, n2), e2 = G.addEdge(n1, n3),
    2.22      e3 = G.addEdge(n4, n2), e4 = G.addEdge(n4, n3);
    2.23 +  ::lemon::ignore_unused_variable_warning(e1,e3,e4);
    2.24  
    2.25    G.changeRed(e2, n4);
    2.26    check(G.redNode(e2) == n4, "Wrong red node");
    2.27 @@ -219,6 +222,7 @@
    2.28    Edge
    2.29      e1 = G.addEdge(n1, n2),
    2.30      e2 = G.addEdge(n1, n3);
    2.31 +  ::lemon::ignore_unused_variable_warning(e1,e2);
    2.32  
    2.33    checkGraphNodeList(G, 3);
    2.34    checkGraphRedNodeList(G, 1);
    2.35 @@ -304,6 +308,7 @@
    2.36    Edge
    2.37      e1 = g.addEdge(n1, n2),
    2.38      e2 = g.addEdge(n1, n3);
    2.39 +  ::lemon::ignore_unused_variable_warning(e2);
    2.40  
    2.41    check(g.valid(n1), "Wrong validity check");
    2.42    check(g.valid(e1), "Wrong validity check");