resolves member function name conflict

This commit is contained in:
Peter Thorson
2012-01-13 08:41:43 -06:00
parent a1b5c503b2
commit e8cd60e3a8
2 changed files with 2 additions and 2 deletions

View File

@@ -46,7 +46,7 @@ namespace websocketpp {
class endpoint_base {
protected:
/// Start the run method of the endpoint's io_service object.
void run() {
void run_internal() {
m_io_service.run();
}

View File

@@ -220,7 +220,7 @@ void server<endpoint>::listen(uint16_t port) {
m_ws_endpoint.alog().at(log::alevel::DEVEL) << "role::server listening on port " << port << log::endl;
m_ws_endpoint.run();
m_ws_endpoint.run_internal();
}
template <class endpoint>