Skip to content
Snippets Groups Projects
Commit 639e6da3 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Merge branch 'master' of https://gitlab.utu.fi/nicolas.pope/ftl

parents 73be238f 5f8cb8f4
No related branches found
No related tags found
No related merge requests found
......@@ -139,7 +139,7 @@ class Universe {
private:
bool active_;
nlohmann::json config_;
std::thread thread_;
std::mutex net_mutex_;
fd_set sfderror_;
fd_set sfdread_;
std::vector<ftl::net::Listener*> listeners_;
......@@ -149,8 +149,7 @@ class Universe {
std::map<ftl::UUID, ftl::net::Peer*> peer_ids_;
ftl::UUID id_;
ftl::net::Dispatcher disp_;
std::mutex net_mutex_;
std::thread thread_;
// std::map<std::string, std::vector<ftl::net::Peer*>> subscriptions_;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment