merges windows support and local branch

This commit is contained in:
Peter Thorson
2011-10-03 07:34:30 -05:00
parent 94b90d0fd4
commit 5fb6f36918
19 changed files with 2528 additions and 1650 deletions

View File

@@ -36,7 +36,7 @@ using websocketpp::server;
server::server(boost::asio::io_service& io_service,
const tcp::endpoint& endpoint,
connection_handler_ptr defc)
websocketpp::connection_handler_ptr defc)
: m_elog_level(LOG_ALL),
m_alog_level(ALOG_ALL),
m_max_message_size(DEFAULT_MAX_MESSAGE_SIZE),
@@ -81,7 +81,7 @@ void server::set_elog_level(uint16_t level) {
m_elog_level = level;
}
bool server::test_alog_level(uint16_t level) {
return (level & m_alog_level);
return ((level & m_alog_level) != 0);
}
void server::set_alog_level(uint16_t level) {
if (test_alog_level(level)) {
@@ -153,7 +153,7 @@ void server::start_accept() {
);
}
void server::handle_accept(server_session_ptr session,
void server::handle_accept(websocketpp::server_session_ptr session,
const boost::system::error_code& error) {
if (!error) {