diff options
author | Mike Buland <eichlan@xagasoft.com> | 2010-04-27 17:07:55 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2010-04-27 17:07:55 +0000 |
commit | 1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c (patch) | |
tree | 3ea239424e33edfc8d9b80aa6b923d944cd0bfa1 /src/itoserver.cpp | |
parent | 801e7de1f85656746d832508baf4583907826420 (diff) | |
download | libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.tar.gz libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.tar.bz2 libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.tar.xz libbu++-1889b55dcbb3f5c5cccc3bcd986b13d0d108ed6c.zip |
The Bu::Ito thread class has changed the rules on the run function. It no
longer returns anything, that's fine, it's in a class, but it also is protected
now. That doesn't really effect child classes much, they can make run public,
but I reccomend protected to avoid confusion.
Diffstat (limited to '')
-rw-r--r-- | src/itoserver.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/itoserver.cpp b/src/itoserver.cpp index 0640aad..279310d 100644 --- a/src/itoserver.cpp +++ b/src/itoserver.cpp | |||
@@ -74,7 +74,7 @@ void Bu::ItoServer::addClient( int nSocket, int nPort ) | |||
74 | pC->start(); | 74 | pC->start(); |
75 | } | 75 | } |
76 | 76 | ||
77 | void *Bu::ItoServer::run() | 77 | void Bu::ItoServer::run() |
78 | { | 78 | { |
79 | for(;;) | 79 | for(;;) |
80 | { | 80 | { |
@@ -105,8 +105,6 @@ void *Bu::ItoServer::run() | |||
105 | delete pCli; | 105 | delete pCli; |
106 | } | 106 | } |
107 | } | 107 | } |
108 | |||
109 | return NULL; | ||
110 | } | 108 | } |
111 | 109 | ||
112 | void Bu::ItoServer::clientCleanup( int iSocket ) | 110 | void Bu::ItoServer::clientCleanup( int iSocket ) |
@@ -138,7 +136,7 @@ Bu::ItoServer::ItoClient::~ItoClient() | |||
138 | { | 136 | { |
139 | } | 137 | } |
140 | 138 | ||
141 | void *Bu::ItoServer::ItoClient::run() | 139 | void Bu::ItoServer::ItoClient::run() |
142 | { | 140 | { |
143 | imProto.lock(); | 141 | imProto.lock(); |
144 | rSrv.onNewConnection( pClient, iPort ); | 142 | rSrv.onNewConnection( pClient, iPort ); |
@@ -186,7 +184,7 @@ void *Bu::ItoServer::ItoClient::run() | |||
186 | 184 | ||
187 | rSrv.clientCleanup( iSocket ); | 185 | rSrv.clientCleanup( iSocket ); |
188 | 186 | ||
189 | return NULL; | 187 | return; |
190 | } | 188 | } |
191 | } | 189 | } |
192 | 190 | ||
@@ -197,8 +195,6 @@ void *Bu::ItoServer::ItoClient::run() | |||
197 | imProto.unlock(); | 195 | imProto.unlock(); |
198 | } | 196 | } |
199 | } | 197 | } |
200 | |||
201 | return NULL; | ||
202 | } | 198 | } |
203 | 199 | ||
204 | Bu::ItoServer::SrvClientLink::SrvClientLink( ItoClient *pClient ) : | 200 | Bu::ItoServer::SrvClientLink::SrvClientLink( ItoClient *pClient ) : |