From a77d92e99a464553085ec3be0520b2f06caf71a2 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Mon, 13 May 2013 07:50:29 -0500 Subject: [PATCH] switches the order of error and access log paramters to be consistent with the rest of the library --- websocketpp/endpoint.hpp | 2 +- websocketpp/transport/asio/endpoint.hpp | 4 ++-- websocketpp/transport/iostream/endpoint.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp index 7c38557774..63b7579c6c 100644 --- a/websocketpp/endpoint.hpp +++ b/websocketpp/endpoint.hpp @@ -99,7 +99,7 @@ public: m_alog.write(log::alevel::devel,"endpoint constructor"); - transport_type::init_logging(&m_elog,&m_alog); + transport_type::init_logging(&m_alog,&m_elog); } /// Returns the user agent string that this endpoint will use diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp index bd40b6a169..d95d88398a 100644 --- a/websocketpp/transport/asio/endpoint.hpp +++ b/websocketpp/transport/asio/endpoint.hpp @@ -377,9 +377,9 @@ protected: * haven't been constructed yet, and cannot be used in the transport * destructor as they will have been destroyed by then. */ - void init_logging(elog_type* e, alog_type* a) { - m_elog = e; + void init_logging(alog_type* a, elog_type* e) { m_alog = a; + m_elog = e; } void handle_accept(connection_hdl hdl, accept_handler callback, diff --git a/websocketpp/transport/iostream/endpoint.hpp b/websocketpp/transport/iostream/endpoint.hpp index fd80aae671..da9e6153e7 100644 --- a/websocketpp/transport/iostream/endpoint.hpp +++ b/websocketpp/transport/iostream/endpoint.hpp @@ -97,7 +97,7 @@ protected: * haven't been constructed yet, and cannot be used in the transport * destructor as they will have been destroyed by then. */ - void init_logging(elog_type* e, alog_type* a) { + void init_logging(alog_type* a, elog_type* e) { m_elog = e; m_alog = a; }