diff options
author | Mike Buland <eichlan@xagasoft.com> | 2006-05-03 06:49:30 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2006-05-03 06:49:30 +0000 |
commit | 96b00553a0ffe6bb34af6ad15e1cfc2bed67bd75 (patch) | |
tree | a930fe51f01a7400fe97b46db2fcfcdc1f2712da /src/connectionmanager.h | |
parent | 33fef4a17290e7872293d8cc173bec826f24001c (diff) | |
download | libbu++-96b00553a0ffe6bb34af6ad15e1cfc2bed67bd75.tar.gz libbu++-96b00553a0ffe6bb34af6ad15e1cfc2bed67bd75.tar.bz2 libbu++-96b00553a0ffe6bb34af6ad15e1cfc2bed67bd75.tar.xz libbu++-96b00553a0ffe6bb34af6ad15e1cfc2bed67bd75.zip |
Added a simple test for the log system, and switched the multilog to the new
singleton system, which unfortunately changed it's API slightly. Now it's not
a pointer from the singleton, but I did add a new macro to make most usage of it
even easier.
Diffstat (limited to 'src/connectionmanager.h')
-rw-r--r-- | src/connectionmanager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/connectionmanager.h b/src/connectionmanager.h index 53249a7..669fcd5 100644 --- a/src/connectionmanager.h +++ b/src/connectionmanager.h | |||
@@ -122,7 +122,6 @@ private: | |||
122 | */ | 122 | */ |
123 | Connection *getInactiveConnection(); | 123 | Connection *getInactiveConnection(); |
124 | 124 | ||
125 | MultiLog *pLog; /**< A pointer to the active MultiLog */ | ||
126 | int nMasterSocket; /**< The listening or server socket. */ | 125 | int nMasterSocket; /**< The listening or server socket. */ |
127 | fd_set fdActive; /**< The active socket set. */ | 126 | fd_set fdActive; /**< The active socket set. */ |
128 | fd_set fdRead; /**< The sockets ready for a read. */ | 127 | fd_set fdRead; /**< The sockets ready for a read. */ |
@@ -130,6 +129,7 @@ private: | |||
130 | fd_set fdException; /**< The sockets that have gotten errors. */ | 129 | fd_set fdException; /**< The sockets that have gotten errors. */ |
131 | std::list<Connection *> lInactive; /**< The pool of inactive Connections */ | 130 | std::list<Connection *> lInactive; /**< The pool of inactive Connections */ |
132 | std::list<Connection *> lActive; /**< The pool of active Connections */ | 131 | std::list<Connection *> lActive; /**< The pool of active Connections */ |
132 | MultiLog &xLog; /**< A handle to the active multilog. */ | ||
133 | 133 | ||
134 | /** The ConnectionMonitor to notify of new connections. */ | 134 | /** The ConnectionMonitor to notify of new connections. */ |
135 | ConnectionMonitor *pMonitor; | 135 | ConnectionMonitor *pMonitor; |