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.

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 @@
 #include "bu/stream.h"
 #include "bu/string.h"
 #include "bu/queuebuf.h"
-#include "bu/itomutex.h"
-#include "bu/itocondition.h"
+#include "bu/mutex.h"
+#include "bu/condition.h"
 
 namespace Bu
 {
@@ -54,8 +54,8 @@ namespace Bu
 
         private:
                 QueueBuf qb;
-                mutable ItoMutex im;
-                ItoCondition cBlock;
+                mutable Mutex im;
+                Condition cBlock;
                 bool bBlocking;
                 bool bOpen;
         };