thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to c++17

Browse source
This commit is contained in:
Nicolas Werner 2019-12-14 17:08:36 +01:00
parent 2ea1e11ffc
commit 659e36b113
17 changed files with 284 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Olm.cpp
View file

@ -1,4 +1,4 @@
#include <boost/variant.hpp>
#include <variant>
#include "Olm.h"
@ -289,14 +289,13 @@ request_keys(const std::string &room_id, const std::string &event_id)
return;
}
if (boost::get<EncryptedEvent<msg::Encrypted>>(&res) == nullptr) {
if (!std::holds_alternative<EncryptedEvent<msg::Encrypted>>(res)) {
nhlog::net()->info(
"retrieved event is not encrypted: {} from {}", event_id, room_id);
return;
}
olm::send_key_request_for(room_id,
boost::get<EncryptedEvent<msg::Encrypted>>(res));
olm::send_key_request_for(room_id, std::get<EncryptedEvent<msg::Encrypted>>(res));
});
}