From 187ebc603c128e7d14982a65659c9f72bcca8e24 Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 2 Oct 2020 13:22:06 +0300 Subject: [PATCH] Make function name unique. GitOrigin-RevId: 2d8e805b36376e2c5f2a5630794ed9797254496c --- td/telegram/Global.cpp | 2 +- td/telegram/Global.h | 2 +- td/telegram/logevent/LogEventHelper.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/td/telegram/Global.cpp b/td/telegram/Global.cpp index 1c2c75931..8a5dcf628 100644 --- a/td/telegram/Global.cpp +++ b/td/telegram/Global.cpp @@ -266,7 +266,7 @@ void Global::add_location_access_hash(double latitude, double longitude, int64 a location_access_hashes_[get_location_key(latitude, longitude)] = access_hash; } -double get_server_time() { +double get_global_server_time() { return G()->server_time(); } diff --git a/td/telegram/Global.h b/td/telegram/Global.h index e5dcac3f0..85d2a2e04 100644 --- a/td/telegram/Global.h +++ b/td/telegram/Global.h @@ -450,6 +450,6 @@ inline Global *G_impl(const char *file, int line) { return static_cast(context); } -double get_server_time(); +double get_global_server_time(); } // namespace td diff --git a/td/telegram/logevent/LogEventHelper.h b/td/telegram/logevent/LogEventHelper.h index 6628e4854..ca24c1854 100644 --- a/td/telegram/logevent/LogEventHelper.h +++ b/td/telegram/logevent/LogEventHelper.h @@ -36,7 +36,7 @@ void store_time(double time_at, StorerT &storer) { } else { double time_left = max(time_at - Time::now(), 0.0); store(time_left, storer); - store(get_server_time(), storer); + store(get_global_server_time(), storer); } }