From bda4cf3a46a617333cef301e9d3c4b669be84a81 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Tue, 7 May 2013 17:46:17 -0500 Subject: [PATCH] updates derived configs to also derive transport_config from base --- websocketpp/config/asio_client.hpp | 21 +++++++++++---------- websocketpp/config/asio_no_tls.hpp | 21 +++++++++++---------- websocketpp/config/asio_no_tls_client.hpp | 21 +++++++++++---------- websocketpp/config/debug_asio.hpp | 2 +- websocketpp/config/debug_asio_no_tls.hpp | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/websocketpp/config/asio_client.hpp b/websocketpp/config/asio_client.hpp index e169537a38..0c03142ecb 100644 --- a/websocketpp/config/asio_client.hpp +++ b/websocketpp/config/asio_client.hpp @@ -41,22 +41,23 @@ namespace config { struct asio_tls_client : public core_client { typedef asio_tls_client type; + typedef core_client base; - typedef core_client::concurrency_type concurrency_type; + typedef base::concurrency_type concurrency_type; - typedef core_client::request_type request_type; - typedef core_client::response_type response_type; + typedef base::request_type request_type; + typedef base::response_type response_type; - typedef core_client::message_type message_type; - typedef core_client::con_msg_manager_type con_msg_manager_type; - typedef core_client::endpoint_msg_manager_type endpoint_msg_manager_type; + typedef base::message_type message_type; + typedef base::con_msg_manager_type con_msg_manager_type; + typedef base::endpoint_msg_manager_type endpoint_msg_manager_type; - typedef core_client::alog_type alog_type; - typedef core_client::elog_type elog_type; + typedef base::alog_type alog_type; + typedef base::elog_type elog_type; - typedef core_client::rng_type rng_type; + typedef base::rng_type rng_type; - struct transport_config { + struct transport_config : public base::transport_config { typedef type::concurrency_type concurrency_type; typedef type::alog_type alog_type; typedef type::elog_type elog_type; diff --git a/websocketpp/config/asio_no_tls.hpp b/websocketpp/config/asio_no_tls.hpp index f4c1d9ea15..6b7bebe3bd 100644 --- a/websocketpp/config/asio_no_tls.hpp +++ b/websocketpp/config/asio_no_tls.hpp @@ -36,22 +36,23 @@ namespace config { struct asio : public core { typedef asio type; + typedef core base; - typedef core::concurrency_type concurrency_type; + typedef base::concurrency_type concurrency_type; - typedef core::request_type request_type; - typedef core::response_type response_type; + typedef base::request_type request_type; + typedef base::response_type response_type; - typedef core::message_type message_type; - typedef core::con_msg_manager_type con_msg_manager_type; - typedef core::endpoint_msg_manager_type endpoint_msg_manager_type; + typedef base::message_type message_type; + typedef base::con_msg_manager_type con_msg_manager_type; + typedef base::endpoint_msg_manager_type endpoint_msg_manager_type; - typedef core::alog_type alog_type; - typedef core::elog_type elog_type; + typedef base::alog_type alog_type; + typedef base::elog_type elog_type; - typedef core::rng_type rng_type; + typedef base::rng_type rng_type; - struct transport_config { + struct transport_config : public base::transport_config { typedef type::concurrency_type concurrency_type; typedef type::alog_type alog_type; typedef type::elog_type elog_type; diff --git a/websocketpp/config/asio_no_tls_client.hpp b/websocketpp/config/asio_no_tls_client.hpp index 7c6f1a87da..8f866ff43a 100644 --- a/websocketpp/config/asio_no_tls_client.hpp +++ b/websocketpp/config/asio_no_tls_client.hpp @@ -36,22 +36,23 @@ namespace config { struct asio_client : public core_client { typedef asio_client type; + typedef core_client base; - typedef core_client::concurrency_type concurrency_type; + typedef base::concurrency_type concurrency_type; - typedef core_client::request_type request_type; - typedef core_client::response_type response_type; + typedef base::request_type request_type; + typedef base::response_type response_type; - typedef core_client::message_type message_type; - typedef core_client::con_msg_manager_type con_msg_manager_type; - typedef core_client::endpoint_msg_manager_type endpoint_msg_manager_type; + typedef base::message_type message_type; + typedef base::con_msg_manager_type con_msg_manager_type; + typedef base::endpoint_msg_manager_type endpoint_msg_manager_type; - typedef core_client::alog_type alog_type; - typedef core_client::elog_type elog_type; + typedef base::alog_type alog_type; + typedef base::elog_type elog_type; - typedef core_client::rng_type rng_type; + typedef base::rng_type rng_type; - struct transport_config { + struct transport_config : public base::transport_config { typedef type::concurrency_type concurrency_type; typedef type::alog_type alog_type; typedef type::elog_type elog_type; diff --git a/websocketpp/config/debug_asio.hpp b/websocketpp/config/debug_asio.hpp index 37f6c98503..1545f10a7e 100644 --- a/websocketpp/config/debug_asio.hpp +++ b/websocketpp/config/debug_asio.hpp @@ -57,7 +57,7 @@ struct debug_asio_tls : public debug_core { typedef base::rng_type rng_type; - struct transport_config { + struct transport_config : public base::transport_config { typedef type::concurrency_type concurrency_type; typedef type::alog_type alog_type; typedef type::elog_type elog_type; diff --git a/websocketpp/config/debug_asio_no_tls.hpp b/websocketpp/config/debug_asio_no_tls.hpp index 6942190153..81c7f40d5b 100644 --- a/websocketpp/config/debug_asio_no_tls.hpp +++ b/websocketpp/config/debug_asio_no_tls.hpp @@ -52,7 +52,7 @@ struct debug_asio : public debug_core { typedef base::rng_type rng_type; - struct transport_config { + struct transport_config : public base::transport_config { typedef type::concurrency_type concurrency_type; typedef type::alog_type alog_type; typedef type::elog_type elog_type;