Ignore:
Timestamp:
Aug 6, 2019, 6:32:58 AM (3 years ago)
Author:
Peter
Message:

merge release 0.16.1 intro trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/yat/utility/PriorityQueue.h

    r3792 r3832  
    44// $Id$
    55//
    6 // Copyright (C) 2015, 2016, 2017, 2018 Peter Johansson
     6// Copyright (C) 2015, 2016, 2017, 2018, 2019 Peter Johansson
    77//
    88// This program is free software; you can redistribute it and/or modify
     
    5656    : public detail::BasicQueue<PriorityQueue<T, Compare>
    5757                                , T
    58                                 , std::set<T, Compare> >
     58                                , std::multiset<T, Compare> >
    5959  {
    6060    friend class detail::BasicQueue<PriorityQueue<T, Compare>
    61                                     ,T,std::set<T,Compare> >;
     61                                    ,T,std::multiset<T,Compare> >;
    6262    typedef detail::BasicQueue<PriorityQueue<T, Compare>
    6363                               , T
    64                                , std::set<T,Compare> > Base;
     64                               , std::multiset<T,Compare> > Base;
    6565  public:
    6666    /**
     
    7373    */
    7474    explicit PriorityQueue(const Compare& comp)
    75       : Base(std::set<T, Compare>(comp)) {}
     75      : Base(std::multiset<T, Compare>(comp)) {}
    7676
    7777    /**
     
    9898      // has been popped and the element is lost. Instead we choose to
    9999      // return via passed reference.
    100       typename std::set<T, Compare>::iterator it = this->q_.end();
     100      typename std::multiset<T, Compare>::iterator it = this->q_.end();
    101101      YAT_ASSERT(this->q_.size());
    102102      --it;
Note: See TracChangeset for help on using the changeset viewer.