1.1 --- a/test/maps_test.cc	Mon Jul 16 16:21:40 2018 +0200
     1.2 +++ b/test/maps_test.cc	Wed Oct 17 19:14:07 2018 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4   *
     1.5   * This file is a part of LEMON, a generic C++ optimization library.
     1.6   *
     1.7 - * Copyright (C) 2003-2010
     1.8 + * Copyright (C) 2003-2013
     1.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    1.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    1.11   *
    1.12 @@ -103,7 +103,7 @@
    1.13      checkConcept<ReadWriteMap<A,B>, NullMap<A,B> >();
    1.14      NullMap<A,B> map1;
    1.15      NullMap<A,B> map2 = map1;
    1.16 -    ignore_unused_variable_warning(map2);
    1.17 +    ::lemon::ignore_unused_variable_warning(map2);
    1.18      map1 = nullMap<A,B>();
    1.19    }
    1.20  
    1.21 @@ -114,14 +114,14 @@
    1.22      ConstMap<A,B> map1;
    1.23      ConstMap<A,B> map2 = B();
    1.24      ConstMap<A,B> map3 = map1;
    1.25 -    ignore_unused_variable_warning(map2,map3);
    1.26 +    ::lemon::ignore_unused_variable_warning(map2,map3);
    1.27  
    1.28      map1 = constMap<A>(B());
    1.29      map1 = constMap<A,B>();
    1.30      map1.setAll(B());
    1.31      ConstMap<A,C> map4(C(1));
    1.32      ConstMap<A,C> map5 = map4;
    1.33 -    ignore_unused_variable_warning(map5);
    1.34 +    ::lemon::ignore_unused_variable_warning(map5);
    1.35  
    1.36      map4 = constMap<A>(C(2));
    1.37      map4.setAll(C(3));
    1.38 @@ -143,7 +143,7 @@
    1.39      checkConcept<ReadMap<A,A>, IdentityMap<A> >();
    1.40      IdentityMap<A> map1;
    1.41      IdentityMap<A> map2 = map1;
    1.42 -    ignore_unused_variable_warning(map2);
    1.43 +    ::lemon::ignore_unused_variable_warning(map2);
    1.44  
    1.45      map1 = identityMap<A>();
    1.46  
    1.47 @@ -204,9 +204,9 @@
    1.48      typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
    1.49      checkConcept<ReadMap<B,double>, CompMap>();
    1.50      CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
    1.51 -    ignore_unused_variable_warning(map1);
    1.52 +    ::lemon::ignore_unused_variable_warning(map1);
    1.53      CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
    1.54 -    ignore_unused_variable_warning(map2);
    1.55 +    ::lemon::ignore_unused_variable_warning(map2);
    1.56  
    1.57      SparseMap<double, bool> m1(false); m1[3.14] = true;
    1.58      RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
    1.59 @@ -219,9 +219,9 @@
    1.60      typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
    1.61      checkConcept<ReadMap<A,double>, CombMap>();
    1.62      CombMap map1 = CombMap(DoubleMap(), DoubleMap());
    1.63 -    ignore_unused_variable_warning(map1);
    1.64 +    ::lemon::ignore_unused_variable_warning(map1);
    1.65      CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
    1.66 -    ignore_unused_variable_warning(map2);
    1.67 +    ::lemon::ignore_unused_variable_warning(map2);
    1.68  
    1.69      check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
    1.70            "Something is wrong with CombineMap");
    1.71 @@ -233,15 +233,15 @@
    1.72      checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
    1.73      FunctorToMap<F> map1;
    1.74      FunctorToMap<F> map2 = FunctorToMap<F>(F());
    1.75 -    ignore_unused_variable_warning(map2);
    1.76 +    ::lemon::ignore_unused_variable_warning(map2);
    1.77  
    1.78      B b = functorToMap(F())[A()];
    1.79 -    ignore_unused_variable_warning(b);
    1.80 +    ::lemon::ignore_unused_variable_warning(b);
    1.81  
    1.82      checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
    1.83      MapToFunctor<ReadMap<A,B> > map =
    1.84        MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
    1.85 -    ignore_unused_variable_warning(map);
    1.86 +    ::lemon::ignore_unused_variable_warning(map);
    1.87  
    1.88      check(functorToMap(&func)[A()] == 3,
    1.89            "Something is wrong with FunctorToMap");
    1.90 @@ -259,9 +259,9 @@
    1.91      checkConcept<ReadMap<double,double>,
    1.92        ConvertMap<ReadMap<double, int>, double> >();
    1.93      ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
    1.94 -    ignore_unused_variable_warning(map1);
    1.95 +    ::lemon::ignore_unused_variable_warning(map1);
    1.96      ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
    1.97 -    ignore_unused_variable_warning(map2);
    1.98 +    ::lemon::ignore_unused_variable_warning(map2);
    1.99  
   1.100    }
   1.101  
   1.102 @@ -535,7 +535,8 @@
   1.103            "Wrong SourceMap or TargetMap");
   1.104  
   1.105      typedef Orienter<Graph, const ConstMap<Edge, bool> > Digraph;
   1.106 -    Digraph dgr(gr, constMap<Edge, bool>(true));
   1.107 +    ConstMap<Edge, bool> true_edge_map(true);
   1.108 +    Digraph dgr(gr, true_edge_map);
   1.109      OutDegMap<Digraph> odm(dgr);
   1.110      InDegMap<Digraph> idm(dgr);
   1.111