merges windows support and local branch

2026-04-29 15:37:57 +00:00 · 2011-10-03 07:34:30 -05:00
parent 94b90d0fd4
commit 5fb6f36918
19 changed files with 2528 additions and 1650 deletions
--- a/src/websocket_server_session.cpp
+++ b/src/websocket_server_session.cpp
@@ -43,9 +43,9 @@

 using websocketpp::server_session;

-server_session::server_session(server_ptr s,
+server_session::server_session(websocketpp::server_ptr s,
                               boost::asio::io_service& io_service,
-                               connection_handler_ptr defc)
+                               websocketpp::connection_handler_ptr defc)
 	: session(io_service,defc),m_server(s) {}

 void server_session::on_connect() {