COIN-OR::LEMON - Graph Library

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


Ignore:
Timestamp:
10/26/06 16:20:17 (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/bucket_heap.h

    r2110 r2263  
    4242  /// the priorities are small. It is not intended to use as dijkstra heap.
    4343  ///
    44   /// \param _Item Type of the items to be stored. 
    4544  /// \param _ItemIntMap A read and writable Item int map, used internally
    4645  /// to handle the cross references.
    4746  /// \param minimize If the given parameter is true then the heap gives back
    4847  /// the lowest priority.
    49   template <typename _Item, typename _ItemIntMap, bool minimize = true >
     48  template <typename _ItemIntMap, bool minimize = true >
    5049  class BucketHeap {
    5150
    5251  public:
    53     typedef _Item Item;
     52    typedef typename _ItemIntMap::Key Item;
    5453    typedef int Prio;
    5554    typedef std::pair<Item, Prio> Pair;
     
    327326
    328327
    329   template <typename _Item, typename _ItemIntMap>
    330   class BucketHeap<_Item, _ItemIntMap, false> {
    331 
    332   public:
    333     typedef _Item Item;
     328  template <typename _ItemIntMap>
     329  class BucketHeap<_ItemIntMap, false> {
     330
     331  public:
     332    typedef typename _ItemIntMap::Key Item;
    334333    typedef int Prio;
    335334    typedef std::pair<Item, Prio> Pair;
     
    525524  /// minimal and it does not supports key increasing, decreasing.
    526525  ///
    527   /// \param _Item Type of the items to be stored. 
    528526  /// \param _ItemIntMap A read and writable Item int map, used internally
    529527  /// to handle the cross references.
     
    532530  ///
    533531  /// \sa BucketHeap
    534   template <typename _Item, typename _ItemIntMap, bool minimize = true >
     532  template <typename _ItemIntMap, bool minimize = true >
    535533  class SimpleBucketHeap {
    536534
    537535  public:
    538     typedef _Item Item;
     536    typedef typename _ItemIntMap::Key Item;
    539537    typedef int Prio;
    540538    typedef std::pair<Item, Prio> Pair;
     
    710708  }; // class SimpleBucketHeap
    711709
    712   template <typename _Item, typename _ItemIntMap>
    713   class SimpleBucketHeap<_Item, _ItemIntMap, false> {
    714 
    715   public:
    716     typedef _Item Item;
     710  template <typename _ItemIntMap>
     711  class SimpleBucketHeap<_ItemIntMap, false> {
     712
     713  public:
     714    typedef typename _ItemIntMap::Key Item;
    717715    typedef int Prio;
    718716    typedef std::pair<Item, Prio> Pair;
Note: See TracChangeset for help on using the changeset viewer.