From b6a741ed236126ef78424902590bec95e908a8d0 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Fri, 3 May 2013 17:12:51 -0500 Subject: [PATCH] fixes utility client tls settings --- examples/utility_client/SConscript | 5 +++-- examples/utility_client/utility_client.cpp | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/utility_client/SConscript b/examples/utility_client/SConscript index 7d4354ef8a..8678c6264b 100644 --- a/examples/utility_client/SConscript +++ b/examples/utility_client/SConscript @@ -6,6 +6,7 @@ Import('env_cpp11') Import('boostlibs') Import('platform_libs') Import('polyfill_libs') +Import('tls_libs') env = env.Clone () env_cpp11 = env_cpp11.Clone () @@ -14,10 +15,10 @@ prgs = [] # if a C++11 environment is avaliable build using that, otherwise use boost if env_cpp11.has_key('WSPP_CPP11_ENABLED'): - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) else: - ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] + ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs] prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) Return('prgs') diff --git a/examples/utility_client/utility_client.cpp b/examples/utility_client/utility_client.cpp index 37e6149698..7a3adcec26 100644 --- a/examples/utility_client/utility_client.cpp +++ b/examples/utility_client/utility_client.cpp @@ -1,17 +1,17 @@ -#include +#include #include #include -typedef websocketpp::client client; +typedef websocketpp::client client; using websocketpp::lib::placeholders::_1; using websocketpp::lib::placeholders::_2; using websocketpp::lib::bind; // pull out the type of messages sent by our config -typedef websocketpp::config::asio_client::message_type::ptr message_ptr; +typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr; void print_handler(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {