COIN-OR::LEMON - Graph Library

Changeset 136:b82dc494bafc in lemon-1.0


Ignore:
Timestamp:
04/17/08 19:33:19 (11 years ago)
Author:
"Balazs Dezso <deba@…
Branch:
default
Phase:
public
Message:

Icc compatibility fixes (ticket #84)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/kruskal.h

    r103 r136  
    213213    };
    214214
     215    template <typename T>
     216    struct RemoveConst {
     217      typedef T type;
     218    };
     219
     220    template <typename T>
     221    struct RemoveConst<const T> {
     222      typedef T type;
     223    };
     224
    215225    template <typename Graph, typename In, typename Out>
    216226    struct KruskalOutputSelector<Graph, In, Out,
     
    220230
    221231      static Value kruskal(const Graph& graph, const In& in, Out& out) {
    222         typedef StoreBoolMap<Out> Map;
     232        typedef StoreBoolMap<typename RemoveConst<Out>::type> Map;
    223233        Map map(out);
    224234        return _kruskal_bits::kruskal(graph, in, map);
  • test/maps_test.cc

    r123 r136  
    8686    checkConcept<ReadWriteMap<A,C>, ConstMap<A,C> >();
    8787    ConstMap<A,B> map1;
    88     ConstMap<A,B> map2(B());
     88    ConstMap<A,B> map2 = B();
    8989    ConstMap<A,B> map3 = map1;
    9090    map1 = constMap<A>(B());
     
    144144    checkConcept<ReferenceMap<A,B,B&,const B&>, SparseMap<A,B> >();
    145145    SparseMap<A,B> map1;
    146     SparseMap<A,B> map2(B());
     146    SparseMap<A,B> map2 = B();
    147147    SparseMap<A,B> map3 = sparseMap<A,B>();
    148148    SparseMap<A,B> map4 = sparseMap<A>(B());
Note: See TracChangeset for help on using the changeset viewer.