Changes in / [122:35840c5aa696:124:ae7785fe8431] in lemon-main

Files:

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

lemon/maps.h

@@ -117 +117 @@
 
     /// Constructor with specified initial value.
-    /// \param v is the initial value of the map.
+    /// \param v The initial value of the map.
     ConstMap(const Value &v) : _value(v) {}
 
@@ -142 +142 @@
   inline ConstMap<K, V> constMap(const V &v) {
     return ConstMap<K, V>(v);
+  }
+
+  template<typename K, typename V>
+  inline ConstMap<K, V> constMap() {
+    return ConstMap<K, V>();
   }
 
@@ -614 +619 @@
            typename V = typename F::result_type>
   class FunctorToMap : public MapBase<K, V> {
-    const F &_f;
+    F _f;
   public:
     typedef MapBase<K, V> Parent;

test/maps_test.cc

@@ -84 +84 @@
   {
     checkConcept<ReadWriteMap<A,B>, ConstMap<A,B> >();
+    checkConcept<ReadWriteMap<A,C>, ConstMap<A,C> >();
     ConstMap<A,B> map1;
     ConstMap<A,B> map2(B());
     ConstMap<A,B> map3 = map1;
     map1 = constMap<A>(B());
+    map1 = constMap<A,B>();
     map1.setAll(B());
+    ConstMap<A,C> map4(C(1));
+    ConstMap<A,C> map5 = map4;
+    map4 = constMap<A>(C(2));
+    map4.setAll(C(3));
 
     checkConcept<ReadWriteMap<A,int>, ConstMap<A,int> >();
@@ -94 +100 @@
 
     checkConcept<ReadWriteMap<A,int>, ConstMap<A,Const<int,10> > >();
-    ConstMap<A,Const<int,10> > map4;
-    ConstMap<A,Const<int,10> > map5 = map4;
-    map4 = map5;
-    check(map4[A()] == 10 && map5[A()] == 10, "Something is wrong with ConstMap");
+    ConstMap<A,Const<int,10> > map6;
+    ConstMap<A,Const<int,10> > map7 = map6;
+    map6 = constMap<A,int,10>();
+    map7 = constMap<A,Const<int,10> >();
+    check(map6[A()] == 10 && map7[A()] == 10, "Something is wrong with ConstMap");
   }