diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-10-27 04:44:46 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-10-27 04:44:46 +0000 |
commit | 9906ffe3c54875133448134c09ec12a0949d48cd (patch) | |
tree | 0542fef3d27e796700b87b44394a3ad31dd5b852 /src/conduit.h | |
parent | 411f240da34bab53cd18aa8b7ba09834ede49b1c (diff) | |
parent | 029b5d159023f4dad607359dbfaa2479e21fe9e5 (diff) | |
download | libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.tar.gz libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.tar.bz2 libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.tar.xz libbu++-9906ffe3c54875133448134c09ec12a0949d48cd.zip |
Reorg'd! I merged in the release-fixup branch and fixed all random warnings.
I also cleaned up the build script, the symlink generation is faster and looks
nicer, there's one think left to fix there, but it's not too bad.
Diffstat (limited to 'src/conduit.h')
-rw-r--r-- | src/conduit.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conduit.h b/src/conduit.h index 72b8d52..9babaaf 100644 --- a/src/conduit.h +++ b/src/conduit.h | |||
@@ -11,8 +11,8 @@ | |||
11 | #include "bu/stream.h" | 11 | #include "bu/stream.h" |
12 | #include "bu/string.h" | 12 | #include "bu/string.h" |
13 | #include "bu/queuebuf.h" | 13 | #include "bu/queuebuf.h" |
14 | #include "bu/itomutex.h" | 14 | #include "bu/mutex.h" |
15 | #include "bu/itocondition.h" | 15 | #include "bu/condition.h" |
16 | 16 | ||
17 | namespace Bu | 17 | namespace Bu |
18 | { | 18 | { |
@@ -54,8 +54,8 @@ namespace Bu | |||
54 | 54 | ||
55 | private: | 55 | private: |
56 | QueueBuf qb; | 56 | QueueBuf qb; |
57 | mutable ItoMutex im; | 57 | mutable Mutex im; |
58 | ItoCondition cBlock; | 58 | Condition cBlock; |
59 | bool bBlocking; | 59 | bool bBlocking; |
60 | bool bOpen; | 60 | bool bOpen; |
61 | }; | 61 | }; |