Changeset 44:7bbd94715db5 in lemon-main

Timestamp:

01/07/08 19:44:18 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

42:3a98515e9bc3 (diff), 43:17e76967c49f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• lemon/maps.h (modified) (5 diffs)
• lemon/maps.h (modified) (2 diffs)

lemon/maps.h

@@ -116 +116 @@
 
     template<typename T1>
-    struct rebind {
-      typedef ConstMap<K, T1> other;
-    };
-
-    template<typename T1>
     ConstMap(const ConstMap<K, T1> &, const T &_v) : v(_v) {}
   };
@@ -244 +239 @@
     }    
 
-    template <typename T1, typename C1 = std::less<T1> >
-    struct rebind {
-      typedef StdMap<Key, T1, C1> other;
-    };
   };
 
@@ -393 +384 @@
   ///Simple wrapping of a map
 
-  ///This \c concepts::ReadMap "read only map" returns the simple
+  ///This \ref concepts::ReadMap "read only map" returns the simple
   ///wrapping of the given map. Sometimes the reference maps cannot be
   ///combined with simple read maps. This map adaptor wraps the given
@@ -416 +407 @@
   };
 
-  ///Simple writable wrapping of the map
-
-  ///This \c concepts::WriteMap "write map" returns the simple
+  ///Simple writable wrapping of a map
+
+  ///This \ref concepts::WriteMap "write map" returns the simple
   ///wrapping of the given map. Sometimes the reference maps cannot be
   ///combined with simple read-write maps. This map adaptor wraps the
@@ -1554 +1545 @@
     }
 
-    /// Setter function of the map
+    /// The \c set function of the map
     void set(const Key& key, Value value) {
       if (value) {

lemon/maps.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library
  *
- * Copyright (C) 2003-2007
+ * Copyright (C) 2003-2008
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -170 +170 @@
 
     typedef True ReferenceMapTag;
-    ///\e
+    ///Key type
     typedef K Key;
-    ///\e
+    ///Value type
     typedef T Value;
-    ///\e
+    ///Reference Type
     typedef T& Reference;
-    ///\e
+    ///Const reference type
     typedef const T& ConstReference;