Merge branch 'master' into permessage-deflate

Update permessage-deflate to track latest release version.
2015-06-03 09:21:06 -04:00
parent d68fd03e40 c5510d6de0
commit 0d7052d2ae
47 changed files with 1356 additions and 392 deletions
@@ -84,7 +84,9 @@ int main(int argc, char * argv[]) {
        echo_server.init_asio();
        
        // Register our message handler
-        echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
+        using websocketpp::lib::placeholders::_1;
+        using websocketpp::lib::placeholders::_2;
+        echo_server.set_message_handler(bind(&on_message,&echo_server,_1,_2));
        
        // Listen on port 9002
        echo_server.listen(9002);