Corrects more obscure shadowed variable cases 2

This commit is contained in:
Peter Thorson
2014-02-02 13:17:17 -06:00
parent 09940a5c0b
commit c84cc110aa
6 changed files with 11 additions and 14 deletions

View File

@@ -303,7 +303,7 @@ public:
, m_send_buffer_size(0)
, m_write_flag(false)
, m_read_flag(true)
, m_is_server(is_server)
, m_is_server(p_is_server)
, m_alog(alog)
, m_elog(elog)
, m_rng(rng)

View File

@@ -58,8 +58,8 @@ public:
typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
explicit hybi00(bool secure, bool server, msg_manager_ptr manager)
: processor<config>(secure, server)
explicit hybi00(bool secure, bool p_is_server, msg_manager_ptr manager)
: processor<config>(secure, p_is_server)
, msg_hdr(0x00)
, msg_ftr(0xff)
, m_state(HEADER)

View File

@@ -45,9 +45,8 @@ public:
typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
typedef typename config::rng_type rng_type;
explicit hybi07(bool secure, bool server, msg_manager_ptr manager,
rng_type& rng)
: hybi08<config>(secure, server, manager, rng) {}
explicit hybi07(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
: hybi08<config>(secure, p_is_server, manager, rng) {}
// outgoing client connection processing is not supported for this version
lib::error_code client_handshake_request(request_type & req, uri_ptr uri,

View File

@@ -46,9 +46,8 @@ public:
typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
typedef typename config::rng_type rng_type;
explicit hybi08(bool secure, bool server, msg_manager_ptr manager,
rng_type& rng)
: hybi13<config>(secure, server, manager, rng) {}
explicit hybi08(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
: hybi13<config>(secure, p_is_server, manager, rng) {}
// outgoing client connection processing is not supported for this version
lib::error_code client_handshake_request(request_type& req, uri_ptr uri,

View File

@@ -68,9 +68,8 @@ public:
typedef std::pair<lib::error_code,std::string> err_str_pair;
explicit hybi13(bool secure, bool server, msg_manager_ptr manager,
rng_type& rng)
: processor<config>(secure,server)
explicit hybi13(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
: processor<config>(secure, p_is_server)
, m_msg_manager(manager)
, m_rng(rng)
{

View File

@@ -159,9 +159,9 @@ public:
typedef typename config::message_type::ptr message_ptr;
typedef std::pair<lib::error_code,std::string> err_str_pair;
explicit processor(bool secure, bool server)
explicit processor(bool secure, bool p_is_server)
: m_secure(secure)
, m_server(server) {}
, m_server(p_is_server) {}
virtual ~processor() {}