Replace InstanceCounter with CountedObject

This commit is contained in:
Vinnie Falco
2013-06-17 17:45:33 -07:00
parent abce930b8b
commit 2abec05b5b
53 changed files with 321 additions and 334 deletions

View File

@@ -11,8 +11,6 @@
#include "../websocketpp/src/sockets/autotls.hpp"
#include "../websocketpp/src/websocketpp.hpp"
DEFINE_INSTANCE (WebSocketConnection);
// This is for logging
struct WSConnectionLog;
@@ -23,8 +21,10 @@ class WSServerHandler;
// - Subscriptions
//
template <typename endpoint_type>
class WSConnection : public InfoSub, public IS_INSTANCE (WebSocketConnection),
public boost::enable_shared_from_this< WSConnection<endpoint_type> >
class WSConnection
: public InfoSub
, public boost::enable_shared_from_this< WSConnection<endpoint_type> >
, public CountedObject <WSConnection <endpoint_type> >
{
public:
typedef typename endpoint_type::connection_type connection;