Changeset 2263:9273fe7d850c in lemon-0.x for lemon/radix_heap.h

Timestamp:

10/26/06 16:20:17 (18 years ago)

Author:

mqrelly

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3021

Message:

Bug #46 fixed: Superfluous template parameter in Heap concept
NOTE: Not every affected file tested.

File:

• lemon/radix_heap.h (modified) (4 diffs)

lemon/radix_heap.h

@@ -55 +55 @@
   /// item's priority.
   ///
-  /// \param _Item Type of the items to be stored.  
   /// \param _ItemIntMap A read and writable Item int map, used internally
   /// to handle the cross references.
@@ -63 +62 @@
   /// \author Balazs Dezso
 
-  template <typename _Item, typename _ItemIntMap>
+  template <typename _ItemIntMap>
   class RadixHeap {
 
   public:
-    typedef _Item Item;
+    typedef typename _ItemIntMap::Key Item;
     typedef int Prio;
     typedef _ItemIntMap ItemIntMap;
@@ -300 +299 @@
     /// \pre The heap must be nonempty.  
     Item top() const {
-      const_cast<RadixHeap<Item, ItemIntMap>&>(*this).moveDown();
+      const_cast<RadixHeap<ItemIntMap>&>(*this).moveDown();
       return data[boxes[0].first].item;
     }
@@ -309 +308 @@
     /// \pre The heap must be nonempty.
     Prio prio() const {
-      const_cast<RadixHeap<Item, ItemIntMap>&>(*this).moveDown();
+      const_cast<RadixHeap<ItemIntMap>&>(*this).moveDown();
       return data[boxes[0].first].prio;
      }