From c84cc110aacb5eda0b8208e0b7c39263d2839842 Mon Sep 17 00:00:00 2001
From: Peter Thorson <github@zaphoyd.com>
Date: Sun, 2 Feb 2014 13:17:17 -0600
Subject: [PATCH] Corrects more obscure shadowed variable cases 2

---
 websocketpp/connection.hpp           | 2 +-
 websocketpp/processors/hybi00.hpp    | 4 ++--
 websocketpp/processors/hybi07.hpp    | 5 ++---
 websocketpp/processors/hybi08.hpp    | 5 ++---
 websocketpp/processors/hybi13.hpp    | 5 ++---
 websocketpp/processors/processor.hpp | 4 ++--
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/websocketpp/connection.hpp b/websocketpp/connection.hpp
index dc15c1317b..6e1e6c5818 100644
--- a/websocketpp/connection.hpp
+++ b/websocketpp/connection.hpp
@@ -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)
diff --git a/websocketpp/processors/hybi00.hpp b/websocketpp/processors/hybi00.hpp
index 19ae652b18..8e04a74025 100644
--- a/websocketpp/processors/hybi00.hpp
+++ b/websocketpp/processors/hybi00.hpp
@@ -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)
diff --git a/websocketpp/processors/hybi07.hpp b/websocketpp/processors/hybi07.hpp
index 8b2df0ee8e..bf4956dd6d 100644
--- a/websocketpp/processors/hybi07.hpp
+++ b/websocketpp/processors/hybi07.hpp
@@ -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,
diff --git a/websocketpp/processors/hybi08.hpp b/websocketpp/processors/hybi08.hpp
index 54f21036b7..ba9e2109bd 100644
--- a/websocketpp/processors/hybi08.hpp
+++ b/websocketpp/processors/hybi08.hpp
@@ -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,
diff --git a/websocketpp/processors/hybi13.hpp b/websocketpp/processors/hybi13.hpp
index dc6b105388..d7d1a1edfe 100644
--- a/websocketpp/processors/hybi13.hpp
+++ b/websocketpp/processors/hybi13.hpp
@@ -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)
     {
diff --git a/websocketpp/processors/processor.hpp b/websocketpp/processors/processor.hpp
index 6333b5b543..ae3edd5504 100644
--- a/websocketpp/processors/processor.hpp
+++ b/websocketpp/processors/processor.hpp
@@ -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() {}