Fix warning.

GitOrigin-RevId: c54303ab305fec0f7b30a5d231688add912b97d0
This commit is contained in:
levlam 2018-06-28 16:50:43 +03:00
parent b74ca51b36
commit 002f4e31b0
2 changed files with 4 additions and 2 deletions

View File

@ -25714,6 +25714,7 @@ void MessagesManager::update_used_hashtags(DialogId dialog_id, const Message *m)
MessagesManager::Message *MessagesManager::continue_send_message(DialogId dialog_id, unique_ptr<Message> &&m, MessagesManager::Message *MessagesManager::continue_send_message(DialogId dialog_id, unique_ptr<Message> &&m,
uint64 logevent_id) { uint64 logevent_id) {
CHECK(logevent_id != 0);
Dialog *d = get_dialog_force(dialog_id); Dialog *d = get_dialog_force(dialog_id);
if (d == nullptr) { if (d == nullptr) {
LOG(ERROR) << "Can't find " << dialog_id << " to resend a message"; LOG(ERROR) << "Can't find " << dialog_id << " to resend a message";
@ -25870,7 +25871,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
auto dialog_id = log_event.dialog_id; auto dialog_id = log_event.dialog_id;
auto m = std::move(log_event.m_out); auto m = std::move(log_event.m_out);
m->send_message_logevent_id = 0; m->send_message_logevent_id = 0; // to not allow event deletion by message deletion
CHECK(m->content->get_id() == MessageScreenshotTaken::ID); CHECK(m->content->get_id() == MessageScreenshotTaken::ID);

View File

@ -140,7 +140,8 @@ Result<string> idn_to_ascii(CSlice host) {
#if TD_WINDOWS #if TD_WINDOWS
TRY_RESULT(whost, to_wstring(host)); TRY_RESULT(whost, to_wstring(host));
wchar_t punycode[MAX_DNS_NAME_LENGTH + 1]; wchar_t punycode[MAX_DNS_NAME_LENGTH + 1];
int result_length = IdnToAscii(IDN_ALLOW_UNASSIGNED, whost.c_str(), whost.size(), punycode, MAX_DNS_NAME_LENGTH); int result_length =
IdnToAscii(IDN_ALLOW_UNASSIGNED, whost.c_str(), narrow_cast<int>(whost.size()), punycode, MAX_DNS_NAME_LENGTH);
if (result_length == 0) { if (result_length == 0) {
return Status::Error("Host can't be converted to ASCII"); return Status::Error("Host can't be converted to ASCII");
} }