diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
commit | 393f1b414746a7f1977971dd7659dd2b47092b11 (patch) | |
tree | 81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/itoserver.h | |
parent | c259f95bd0e58b247940a339bb9b4b401b4e9438 (diff) | |
parent | 7e25a863325dc3e9762397e700030969e093b087 (diff) | |
download | libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2 libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip |
Wow! Merged the branch, streams are updated, and there's no more FString, run
the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.
Diffstat (limited to 'src/itoserver.h')
-rw-r--r-- | src/itoserver.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/itoserver.h b/src/itoserver.h index 81e42cc..902c684 100644 --- a/src/itoserver.h +++ b/src/itoserver.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -14,7 +14,7 @@ | |||
14 | #include <sys/select.h> | 14 | #include <sys/select.h> |
15 | #endif | 15 | #endif |
16 | 16 | ||
17 | #include "bu/fstring.h" | 17 | #include "bu/string.h" |
18 | #include "bu/list.h" | 18 | #include "bu/list.h" |
19 | #include "bu/ito.h" | 19 | #include "bu/ito.h" |
20 | #include "bu/itomutex.h" | 20 | #include "bu/itomutex.h" |
@@ -59,7 +59,7 @@ namespace Bu | |||
59 | virtual ~ItoServer(); | 59 | virtual ~ItoServer(); |
60 | 60 | ||
61 | void addPort( int nPort, int nPoolSize=40 ); | 61 | void addPort( int nPort, int nPoolSize=40 ); |
62 | void addPort( const FString &sAddr, int nPort, int nPoolSize=40 ); | 62 | void addPort( const String &sAddr, int nPort, int nPoolSize=40 ); |
63 | 63 | ||
64 | //void scan(); | 64 | //void scan(); |
65 | void setTimeout( int nTimeoutSec, int nTimeoutUSec=0 ); | 65 | void setTimeout( int nTimeoutSec, int nTimeoutUSec=0 ); |
@@ -82,7 +82,7 @@ namespace Bu | |||
82 | int nTimeoutSec, int nTimeoutUSec ); | 82 | int nTimeoutSec, int nTimeoutUSec ); |
83 | virtual ~ItoClient(); | 83 | virtual ~ItoClient(); |
84 | 84 | ||
85 | typedef ItoQueue<Bu::FString *> StringQueue; | 85 | typedef ItoQueue<Bu::String *> StringQueue; |
86 | StringQueue qMsg; | 86 | StringQueue qMsg; |
87 | 87 | ||
88 | protected: | 88 | protected: |
@@ -105,7 +105,7 @@ namespace Bu | |||
105 | SrvClientLink( ItoClient *pClient ); | 105 | SrvClientLink( ItoClient *pClient ); |
106 | virtual ~SrvClientLink(); | 106 | virtual ~SrvClientLink(); |
107 | 107 | ||
108 | virtual void sendMessage( const Bu::FString &sMsg ); | 108 | virtual void sendMessage( const Bu::String &sMsg ); |
109 | 109 | ||
110 | private: | 110 | private: |
111 | ItoClient *pClient; | 111 | ItoClient *pClient; |