Changeset 94:a4688e4138ec in lemon-main

Timestamp:

03/18/08 13:57:15 (17 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Fixes in the map concepts

• Now Value type needn't be default constructible.
• Extend the test file to check this.

Files:

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

lemon/concepts/maps.h

@@ -48 +48 @@
 
       /// Returns the value associated with the given key.
-
-      /// Returns the value associated with the given key.
-      /// \bug Value shouldn't need to be default constructible. 
-      Value operator[](const Key &) const { return Value(); }
+      Value operator[](const Key &) const { 
+        return *static_cast<Value *>(0);
+      }
 
       template<typename _ReadMap>
@@ -127 +126 @@
 
       /// Returns the value associated with the given key.
-      Value operator[](const Key &) const { return Value(); }
+      Value operator[](const Key &) const { 
+        return *static_cast<Value *>(0);
+      }
 
       /// Sets the value associated with the given key.
@@ -161 +162 @@
       typedef CR ConstReference;
 
-    protected:
-      Value tmp;
     public:
 
       /// Returns a reference to the value associated with the given key.
-      Reference operator[](const Key &) { return tmp; }
+      Reference operator[](const Key &) { 
+        return *static_cast<Value *>(0);
+      }
 
       /// Returns a const reference to the value associated with the given key.
-      ConstReference operator[](const Key &) const { return tmp; }
+      ConstReference operator[](const Key &) const {
+        return *static_cast<Value *>(0);
+      }
 
       /// Sets the value associated with the given key.

test/maps_test.cc

@@ -32 +32 @@
 inline bool operator<(A, A) { return true; }
 struct B {};
+
+class C {
+  int x;
+public:
+  C(int _x) : x(_x) {}
+};
 
 class F {
@@ -59 +65 @@
   // Map concepts
   checkConcept<ReadMap<A,B>, ReadMap<A,B> >();
+  checkConcept<ReadMap<A,C>, ReadMap<A,C> >();
   checkConcept<WriteMap<A,B>, WriteMap<A,B> >();
+  checkConcept<WriteMap<A,C>, WriteMap<A,C> >();
   checkConcept<ReadWriteMap<A,B>, ReadWriteMap<A,B> >();
+  checkConcept<ReadWriteMap<A,C>, ReadWriteMap<A,C> >();
   checkConcept<ReferenceMap<A,B,B&,const B&>, ReferenceMap<A,B,B&,const B&> >();
+  checkConcept<ReferenceMap<A,C,C&,const C&>, ReferenceMap<A,C,C&,const C&> >();
 
   // NullMap