COIN-OR::LEMON - Graph Library

Ignore:
Timestamp:
08/07/13 06:31:47 (6 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.1
Parents:
1248:14394c9603c2 (diff), 1257:3e711ee55d31 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge #294 to branch 1.1

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/circulation_test.cc

    r1172 r1258  
    7474  VType v;
    7575  bool b;
    76   ignore_unused_variable_warning(v,b);
     76  ::lemon::ignore_unused_variable_warning(v,b);
    7777
    7878  typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
     
    100100  const_circ_test.barrierMap(bar);
    101101
    102   ignore_unused_variable_warning(fm);
     102  ::lemon::ignore_unused_variable_warning(fm);
    103103}
    104104
  • test/circulation_test.cc

    r1257 r1258  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2011
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    8383  CirculationType circ_test(g, lcap, ucap, supply);
    8484  const CirculationType& const_circ_test = circ_test;
    85    
     85
    8686  circ_test
    8787    .lowerMap(lcap)
     
    9999  b = const_circ_test.barrier(n);
    100100  const_circ_test.barrierMap(bar);
    101  
     101
    102102  ::lemon::ignore_unused_variable_warning(fm);
    103103}
Note: See TracChangeset for help on using the changeset viewer.