tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix g++4.9 compilation errors.

Browse Source
This commit is contained in:
levlam 2021-12-01 20:54:56 +03:00
parent 1d3cf2c209
commit 4f8cfce082
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
td/telegram/FileReferenceManager.cpp
View File

@ -173,8 +173,8 @@ void FileReferenceManager::merge(NodeId to_node_id, NodeId from_node_id) {
auto &from = from_it->second;
VLOG(file_references) << "Merge " << to.file_source_ids.size() << " and " << from.file_source_ids.size()
<< " sources of files " << to_node_id << " and " << from_node_id;
CHECK(!to.query || to.query->proxy.empty());
CHECK(!from.query || from.query->proxy.empty());
CHECK(!to.query || to.query->proxy.is_empty());
CHECK(!from.query || from.query->proxy.is_empty());
if (to.query || from.query) {
if (!to.query) {
to.query = make_unique<Query>();
@ -183,7 +183,7 @@ void FileReferenceManager::merge(NodeId to_node_id, NodeId from_node_id) {
if (from.query) {
combine(to.query->promises, std::move(from.query->promises));
to.query->active_queries += from.query->active_queries;
from.query->proxy = {to_node_id, to.query->generation};
from.query->proxy = Destination(to_node_id, to.query->generation);
}
}
to.file_source_ids.merge(std::move(from.file_source_ids));
@ -225,7 +225,7 @@ void FileReferenceManager::run_node(NodeId node_id) {
return;
}
auto file_source_id = node.file_source_ids.next();
send_query({node_id, node.query->generation}, file_source_id);
send_query(Destination(node_id, node.query->generation), file_source_id);
}
void FileReferenceManager::send_query(Destination dest, FileSourceId file_source_id) {
@ -325,7 +325,7 @@ FileReferenceManager::Destination FileReferenceManager::on_query_result(Destinat
query->active_queries--;
CHECK(query->active_queries >= 0);
if (!query->proxy.empty()) {
if (!query->proxy.is_empty()) {
query->active_queries -= sub;
CHECK(query->active_queries >= 0);
auto new_proxy = on_query_result(query->proxy, file_source_id, std::move(status), query->active_queries);

10
td/telegram/FileReferenceManager.h
View File

@ -76,11 +76,15 @@ class FileReferenceManager final : public Actor {
private:
struct Destination {
bool empty() const {
return node_id.empty();
}
NodeId node_id;
int64 generation{0};
Destination() = default;
Destination(NodeId node_id, int64 generation) : node_id(node_id), generation(generation) {
}
bool is_empty() const {
return node_id.empty();
}
};
struct Query {
std::vector<Promise<>> promises;

4
td/telegram/MessagesDb.h
View File

@ -66,8 +66,8 @@ struct MessagesDbGetDialogSparseMessagePositionsQuery {
};
struct MessagesDbMessagePosition {
int32 position{0};
int32 date{0};
int32 position;
int32 date;
MessageId message_id;
};