Changeset 136:b82dc494bafc in lemon-main

Timestamp:

04/17/08 19:33:19 (17 years ago)

Author:

"Balazs Dezso <deba@…

Branch:

default

Phase:

public

Message:

Icc compatibility fixes (ticket #84)

Files:

• lemon/kruskal.h (modified) (2 diffs)
• test/maps_test.cc (modified) (2 diffs)

lemon/kruskal.h

@@ -213 +213 @@
     };
 
+    template <typename T>
+    struct RemoveConst {
+      typedef T type;
+    };
+
+    template <typename T>
+    struct RemoveConst<const T> {
+      typedef T type;
+    };
+
     template <typename Graph, typename In, typename Out>
     struct KruskalOutputSelector<Graph, In, Out,
@@ -220 +230 @@
 
       static Value kruskal(const Graph& graph, const In& in, Out& out) {
-        typedef StoreBoolMap<Out> Map;
+        typedef StoreBoolMap<typename RemoveConst<Out>::type> Map;
         Map map(out);
         return _kruskal_bits::kruskal(graph, in, map);

test/maps_test.cc

@@ -86 +86 @@
     checkConcept<ReadWriteMap<A,C>, ConstMap<A,C> >();
     ConstMap<A,B> map1;
-    ConstMap<A,B> map2(B());
+    ConstMap<A,B> map2 = B();
     ConstMap<A,B> map3 = map1;
     map1 = constMap<A>(B());
@@ -144 +144 @@
     checkConcept<ReferenceMap<A,B,B&,const B&>, SparseMap<A,B> >();
     SparseMap<A,B> map1;
-    SparseMap<A,B> map2(B());
+    SparseMap<A,B> map2 = B();
     SparseMap<A,B> map3 = sparseMap<A,B>();
     SparseMap<A,B> map4 = sparseMap<A>(B());