From fe5bf419800e46e88bbe6661af15cc950a2351bc Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 7 Aug 2020 22:14:42 +0300
Subject: [PATCH] Minor improvements.

GitOrigin-RevId: 45477784ae1840f217b9394e3d0cc56e1241f9ce
---
 tddb/td/db/TQueue.cpp                     | 4 ++--
 tdutils/td/utils/port/detail/skip_eintr.h | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tddb/td/db/TQueue.cpp b/tddb/td/db/TQueue.cpp
index c2a9c098d..2a9509a41 100644
--- a/tddb/td/db/TQueue.cpp
+++ b/tddb/td/db/TQueue.cpp
@@ -231,7 +231,7 @@ class TQueueImpl : public TQueue {
     }
 
     do_get(queue_id, q, from_id, forget_previous, unix_time_now, result_events);
-    return get_size(queue_id);
+    return get_size(q);
   }
 
   int64 run_gc(int32 unix_time_now) override {
@@ -293,7 +293,7 @@ class TQueueImpl : public TQueue {
   std::set<std::pair<int32, QueueId>> queue_gc_at_;
   unique_ptr<StorageCallback> callback_;
 
-  size_t get_size(Queue &q) {
+  static size_t get_size(Queue &q) {
     if (q.events.empty()) {
       return 0;
     }
diff --git a/tdutils/td/utils/port/detail/skip_eintr.h b/tdutils/td/utils/port/detail/skip_eintr.h
index a6a8734a9..a799fc716 100644
--- a/tdutils/td/utils/port/detail/skip_eintr.h
+++ b/tdutils/td/utils/port/detail/skip_eintr.h
@@ -7,9 +7,11 @@
 #pragma once
 
 #if TD_PORT_POSIX
+#include "td/utils/common.h"
+#include "td/utils/Time.h"
+
 #include <cerrno>
 #include <type_traits>
-#include "td/utils/Time.h"
 #endif
 
 namespace td {
@@ -50,7 +52,8 @@ auto skip_eintr_timeout(F &&f, int32 timeout_ms) {
     if (res >= 0 || errno != EINTR) {
       break;
     }
-    left_timeout_ms = max(static_cast<int32>((start.at() - Timestamp::now().at()) * 1000 + timeout_ms + 1 - 1e-9), 0);
+    left_timeout_ms =
+        td::max(static_cast<int32>((start.at() - Timestamp::now().at()) * 1000 + timeout_ms + 1 - 1e-9), 0);
   }
   return res;
 }