diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-10 21:04:17 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-10 21:04:17 +0000 |
commit | 2ba3f84ab559da02a11aa000b3cecb3b3668af61 (patch) | |
tree | 266f450b512f607ec54d54af4fa8c13fdbe7ef91 /src/client.h | |
parent | ea18007633b31901f2ae275cc0576c3f7ce99fc9 (diff) | |
parent | 3611f253f6fdfa4954d374ab85ddaa7f799c130c (diff) | |
download | libbu++-2ba3f84ab559da02a11aa000b3cecb3b3668af61.tar.gz libbu++-2ba3f84ab559da02a11aa000b3cecb3b3668af61.tar.bz2 libbu++-2ba3f84ab559da02a11aa000b3cecb3b3668af61.tar.xz libbu++-2ba3f84ab559da02a11aa000b3cecb3b3668af61.zip |
Merged in the core branch. This is a major update that fixes many things, and
changes many others, including source files that were deleted and renamed.
Before doing this update, I reccomend a full clean, or even a fresh checkout.
Things to note, most outstanding about this update:
- Bu::Socket was changed to Bu::TcpSocket and the default mode is blocking.
- All templatized container classes are SharedCore now, which is good, but
SharedCore is inherently non-reentrant safe. However, all SharedCore classes
have a "clone" function that return a non-shared copy of the object, safe for
passing into a reentrant safe function accessing shared memory.
Diffstat (limited to '')
-rw-r--r-- | src/client.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client.h b/src/client.h index f336524..096df2f 100644 --- a/src/client.h +++ b/src/client.h | |||
@@ -17,7 +17,7 @@ namespace Bu | |||
17 | { | 17 | { |
18 | class Protocol; | 18 | class Protocol; |
19 | class Stream; | 19 | class Stream; |
20 | class Socket; | 20 | class TcpSocket; |
21 | class ClientLinkFactory; | 21 | class ClientLinkFactory; |
22 | 22 | ||
23 | /** | 23 | /** |
@@ -26,7 +26,7 @@ namespace Bu | |||
26 | class Client : public Bu::Stream | 26 | class Client : public Bu::Stream |
27 | { | 27 | { |
28 | public: | 28 | public: |
29 | Client( Bu::Socket *pSocket, Bu::ClientLinkFactory *pfLink ); | 29 | Client( Bu::TcpSocket *pSocket, Bu::ClientLinkFactory *pfLink ); |
30 | virtual ~Client(); | 30 | virtual ~Client(); |
31 | 31 | ||
32 | void processInput(); | 32 | void processInput(); |
@@ -58,7 +58,7 @@ namespace Bu | |||
58 | void close(); | 58 | void close(); |
59 | void tick(); | 59 | void tick(); |
60 | 60 | ||
61 | const Bu::Socket *getSocket() const; | 61 | const Bu::TcpSocket *getSocket() const; |
62 | 62 | ||
63 | void disconnect(); | 63 | void disconnect(); |
64 | bool wantsDisconnect(); | 64 | bool wantsDisconnect(); |
@@ -117,7 +117,7 @@ namespace Bu | |||
117 | typedef Bu::List<Bu::Stream *> FilterList; | 117 | typedef Bu::List<Bu::Stream *> FilterList; |
118 | FilterList lFilts; | 118 | FilterList lFilts; |
119 | Bu::Stream *pTopStream; | 119 | Bu::Stream *pTopStream; |
120 | Bu::Socket *pSocket; | 120 | Bu::TcpSocket *pSocket; |
121 | Bu::Protocol *pProto; | 121 | Bu::Protocol *pProto; |
122 | Bu::QueueBuf qbRead; | 122 | Bu::QueueBuf qbRead; |
123 | Bu::QueueBuf qbWrite; | 123 | Bu::QueueBuf qbWrite; |