From f9c62ee778515271bcb307387941a209122cc9bd Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Mon, 7 Jan 2013 12:18:37 -0600 Subject: [PATCH] Updates configs for new socket API --- websocketpp/config/asio.hpp | 12 +++++++----- websocketpp/config/asio_no_tls.hpp | 5 +++-- websocketpp/config/core.hpp | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/websocketpp/config/asio.hpp b/websocketpp/config/asio.hpp index cc34aeccdc..dfc2dd3f3d 100644 --- a/websocketpp/config/asio.hpp +++ b/websocketpp/config/asio.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Peter Thorson. All rights reserved. + * Copyright (c) 2013, Peter Thorson. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -38,9 +38,10 @@ namespace config { struct asio : public core { typedef core::concurrency_type concurrency_type; - typedef websocketpp::transport::security::none security_type; + typedef websocketpp::transport::asio::basic_socket::endpoint socket_type; - typedef websocketpp::transport::asio::endpoint transport_type; + typedef websocketpp::transport::asio::endpoint + transport_type; typedef core::request_type request_type; typedef core::response_type response_type; @@ -53,9 +54,10 @@ struct asio : public core { struct asio_tls : public core { typedef core::concurrency_type concurrency_type; - typedef websocketpp::transport::security::tls security_type; + typedef websocketpp::transport::asio::tls_socket::endpoint socket_type; - typedef websocketpp::transport::asio::endpoint transport_type; + typedef websocketpp::transport::asio::endpoint + transport_type; typedef core::request_type request_type; typedef core::response_type response_type; diff --git a/websocketpp/config/asio_no_tls.hpp b/websocketpp/config/asio_no_tls.hpp index 1ab1c56fce..a59726507a 100644 --- a/websocketpp/config/asio_no_tls.hpp +++ b/websocketpp/config/asio_no_tls.hpp @@ -37,9 +37,10 @@ namespace config { struct asio : public core { typedef core::concurrency_type concurrency_type; - typedef websocketpp::transport::security::none security_type; + typedef websocketpp::transport::asio::basic_socket::endpoint socket_type; - typedef websocketpp::transport::asio::endpoint transport_type; + typedef websocketpp::transport::asio::endpoint + transport_type; typedef core::request_type request_type; typedef core::response_type response_type; diff --git a/websocketpp/config/core.hpp b/websocketpp/config/core.hpp index f4486cf564..a1b3068682 100644 --- a/websocketpp/config/core.hpp +++ b/websocketpp/config/core.hpp @@ -53,7 +53,8 @@ struct core { typedef websocketpp::concurrency::none concurrency_type; // Transport Policy - typedef websocketpp::transport::iostream::endpoint transport_type; + typedef websocketpp::transport::iostream::endpoint + transport_type; // HTTP Parser Policies typedef http::parser::request request_type;