diff -r cd72eae05bdf -r 3c00344f49c9 test/maps_test.cc --- a/test/maps_test.cc Mon Jul 16 16:21:40 2018 +0200 +++ b/test/maps_test.cc Wed Oct 17 19:14:07 2018 +0200 @@ -2,7 +2,7 @@ * * This file is a part of LEMON, a generic C++ optimization library. * - * Copyright (C) 2003-2010 + * Copyright (C) 2003-2013 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport * (Egervary Research Group on Combinatorial Optimization, EGRES). * @@ -103,7 +103,7 @@ checkConcept, NullMap >(); NullMap map1; NullMap map2 = map1; - ignore_unused_variable_warning(map2); + ::lemon::ignore_unused_variable_warning(map2); map1 = nullMap(); } @@ -114,14 +114,14 @@ ConstMap map1; ConstMap map2 = B(); ConstMap map3 = map1; - ignore_unused_variable_warning(map2,map3); + ::lemon::ignore_unused_variable_warning(map2,map3); map1 = constMap(B()); map1 = constMap(); map1.setAll(B()); ConstMap map4(C(1)); ConstMap map5 = map4; - ignore_unused_variable_warning(map5); + ::lemon::ignore_unused_variable_warning(map5); map4 = constMap(C(2)); map4.setAll(C(3)); @@ -143,7 +143,7 @@ checkConcept, IdentityMap >(); IdentityMap map1; IdentityMap map2 = map1; - ignore_unused_variable_warning(map2); + ::lemon::ignore_unused_variable_warning(map2); map1 = identityMap(); @@ -204,9 +204,9 @@ typedef ComposeMap > CompMap; checkConcept, CompMap>(); CompMap map1 = CompMap(DoubleMap(),ReadMap()); - ignore_unused_variable_warning(map1); + ::lemon::ignore_unused_variable_warning(map1); CompMap map2 = composeMap(DoubleMap(), ReadMap()); - ignore_unused_variable_warning(map2); + ::lemon::ignore_unused_variable_warning(map2); SparseMap m1(false); m1[3.14] = true; RangeMap m2(2); m2[0] = 3.0; m2[1] = 3.14; @@ -219,9 +219,9 @@ typedef CombineMap > CombMap; checkConcept, CombMap>(); CombMap map1 = CombMap(DoubleMap(), DoubleMap()); - ignore_unused_variable_warning(map1); + ::lemon::ignore_unused_variable_warning(map1); CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus()); - ignore_unused_variable_warning(map2); + ::lemon::ignore_unused_variable_warning(map2); check(combineMap(constMap(), identityMap(), &binc)[B()] == 3, "Something is wrong with CombineMap"); @@ -233,15 +233,15 @@ checkConcept, FunctorToMap >(); FunctorToMap map1; FunctorToMap map2 = FunctorToMap(F()); - ignore_unused_variable_warning(map2); + ::lemon::ignore_unused_variable_warning(map2); B b = functorToMap(F())[A()]; - ignore_unused_variable_warning(b); + ::lemon::ignore_unused_variable_warning(b); checkConcept, MapToFunctor > >(); MapToFunctor > map = MapToFunctor >(ReadMap()); - ignore_unused_variable_warning(map); + ::lemon::ignore_unused_variable_warning(map); check(functorToMap(&func)[A()] == 3, "Something is wrong with FunctorToMap"); @@ -259,9 +259,9 @@ checkConcept, ConvertMap, double> >(); ConvertMap, int> map1(rangeMap(1, true)); - ignore_unused_variable_warning(map1); + ::lemon::ignore_unused_variable_warning(map1); ConvertMap, int> map2 = convertMap(rangeMap(2, false)); - ignore_unused_variable_warning(map2); + ::lemon::ignore_unused_variable_warning(map2); } @@ -535,7 +535,8 @@ "Wrong SourceMap or TargetMap"); typedef Orienter > Digraph; - Digraph dgr(gr, constMap(true)); + ConstMap true_edge_map(true); + Digraph dgr(gr, true_edge_map); OutDegMap odm(dgr); InDegMap idm(dgr);