some temporary fixes for windows builds

This commit is contained in:
Peter Thorson
2012-03-07 08:13:46 -06:00
parent 9512891f24
commit 69fb256087
2 changed files with 13 additions and 7 deletions

View File

@@ -238,7 +238,8 @@ public:
typename endpoint::alogger_type& alog() {
return m_endpoint.alog();
}
protected:
public:
//protected: TODO: figure out why VCPP2010 doesn't like protected here
void handle_socket_init(const boost::system::error_code& error) {
if (error) {
m_endpoint.elog().at(log::elevel::RERROR)
@@ -356,7 +357,8 @@ public:
);
}
}
protected:
public:
//protected: TODO: figure out why VCPP2010 doesn't like protected here
void process_data(message::data_ptr msg) {
get_handler()->on_message(type::shared_from_this(),msg);
}
@@ -712,7 +714,8 @@ protected:
handler_ptr get_handler() {
return m_handler;
}
protected:
public:
//protected: TODO: figure out why VCPP2010 doesn't like protected here
endpoint_type& m_endpoint;
handler_ptr m_handler;

View File

@@ -106,14 +106,17 @@ public:
// functions in the derived endpoint. This is done to limit the use of
// public methods in endpoint and its CRTP bases to only those methods
// intended for end-application use.
#ifdef _WEBSOCKETPP_CPP11_FRIEND_
// Highly simplified and preferred C++11 version:
friend role_type;
friend socket_type;
friend connection_type;
#else
friend class role< endpoint<role,socket> >;
friend class socket< endpoint<role,socket> >;
friend class connection<type,role< type >::template connection,socket< type >::template connection>;
#endif
// Highly simplified and preferred C++11 version:
// friend role_type;
// friend socket_type;
// friend connection_type;
/// Construct an endpoint.
/**