Changeset 1258:bdfc038f364c in lemon for test/circulation_test.cc

Timestamp:

08/07/13 06:31:47 (11 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:

• test/circulation_test.cc (modified) (2 diffs)
• test/circulation_test.cc (modified) (3 diffs)

test/circulation_test.cc

@@ -74 +74 @@
   VType v;
   bool b;
-  ignore_unused_variable_warning(v,b);
+  ::lemon::ignore_unused_variable_warning(v,b);
 
   typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
@@ -100 +100 @@
   const_circ_test.barrierMap(bar);
 
-  ignore_unused_variable_warning(fm);
+  ::lemon::ignore_unused_variable_warning(fm);
 }
 

test/circulation_test.cc

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -83 +83 @@
   CirculationType circ_test(g, lcap, ucap, supply);
   const CirculationType& const_circ_test = circ_test;
-   
+
   circ_test
     .lowerMap(lcap)
@@ -99 +99 @@
   b = const_circ_test.barrier(n);
   const_circ_test.barrierMap(bar);
-  
+
   ::lemon::ignore_unused_variable_warning(fm);
 }