diff options
author | 2017-01-22 15:22:35 +1100 | |
---|---|---|
committer | 2017-01-22 15:37:37 +1100 | |
commit | edf64df1db1e1493e6980b79c38c4db744e23cea (patch) | |
tree | a26302d6f41d7de07e25372da5c5d46cdd893e8f /src/emu/main.cpp | |
parent | 32ab35fa06fa81b0ceebb6e832858343bbc3f488 (diff) |
srcclean (nw)
Diffstat (limited to 'src/emu/main.cpp')
-rw-r--r-- | src/emu/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/main.cpp b/src/emu/main.cpp index ea77d976b00..54890c5dff0 100644 --- a/src/emu/main.cpp +++ b/src/emu/main.cpp @@ -109,10 +109,10 @@ static std::string extension_to_type(const std::string& extension) return "text/plain"; } -machine_manager::machine_manager(emu_options& options, osd_interface& osd) - : m_osd(osd), - m_options(options), - m_machine(nullptr), +machine_manager::machine_manager(emu_options& options, osd_interface& osd) + : m_osd(osd), + m_options(options), + m_machine(nullptr), m_io_context(std::make_shared<asio::io_context>()) { } @@ -184,7 +184,7 @@ void machine_manager::start_http_server() *send_stream << "update_machine"; m_wsserver->send(connection, send_stream); }; - + m_server->on_upgrade = [this](auto socket, auto request) { auto connection = std::make_shared<webpp::ws_server::Connection>(socket); connection->method = std::move(request->method); |