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/buffer.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 '')
-rw-r--r-- | src/buffer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/buffer.h b/src/buffer.h index 97d4127..17c6d73 100644 --- a/src/buffer.h +++ b/src/buffer.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. |
@@ -19,13 +19,13 @@ namespace Bu | |||
19 | virtual ~Buffer(); | 19 | virtual ~Buffer(); |
20 | 20 | ||
21 | virtual void start(); | 21 | virtual void start(); |
22 | virtual size_t stop(); | 22 | virtual Bu::size stop(); |
23 | 23 | ||
24 | virtual size_t read( void *pBuf, size_t nBytes ); | 24 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
25 | virtual size_t write( const void *pBuf, size_t nBytes ); | 25 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
26 | using Stream::write; | 26 | using Stream::write; |
27 | 27 | ||
28 | size_t getReadFill() { return iReadBufFill; } | 28 | Bu::size getReadFill() { return iReadBufFill; } |
29 | bool isWritePending() { return iWriteBufFill > 0; } | 29 | bool isWritePending() { return iWriteBufFill > 0; } |
30 | 30 | ||
31 | virtual void flush(); | 31 | virtual void flush(); |
@@ -36,7 +36,7 @@ namespace Bu | |||
36 | void fillReadBuf(); | 36 | void fillReadBuf(); |
37 | 37 | ||
38 | private: | 38 | private: |
39 | size_t sSoFar; | 39 | Bu::size sSoFar; |
40 | int iBufSize; | 40 | int iBufSize; |
41 | char *sReadBuf; | 41 | char *sReadBuf; |
42 | char *sWriteBuf; | 42 | char *sWriteBuf; |