From 89fad4fdb93c0a3dd93cf1d016e959c25233da94 Mon Sep 17 00:00:00 2001 From: Arseny Smirnov Date: Tue, 18 Aug 2020 18:37:10 +0300 Subject: [PATCH] Session::PriorityQueue: minor simplification GitOrigin-RevId: f0baab28bb95afef247e4ad0c291222be6d105c5 --- td/telegram/net/Session.cpp | 6 +++--- td/telegram/net/Session.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/td/telegram/net/Session.cpp b/td/telegram/net/Session.cpp index d811f3f05..cdf7075b1 100644 --- a/td/telegram/net/Session.cpp +++ b/td/telegram/net/Session.cpp @@ -123,11 +123,11 @@ void Session::PriorityQueue::push(NetQueryPtr query) { } NetQueryPtr Session::PriorityQueue::pop() { - auto it = queries_.rbegin(); - CHECK(it != queries_.rend()); + CHECK(!empty()); + auto it = queries_.begin(); auto res = it->second.pop(); if (it->second.empty()) { - queries_.erase(it->first); + queries_.erase(it); } return res; } diff --git a/td/telegram/net/Session.h b/td/telegram/net/Session.h index 0b314dfb2..0ab31a7be 100644 --- a/td/telegram/net/Session.h +++ b/td/telegram/net/Session.h @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -132,7 +133,7 @@ class Session final bool empty() const; private: - std::map> queries_; + std::map, std::greater<>> queries_; }; PriorityQueue pending_queries_; std::map sent_queries_;