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, 9 insertions, 12 deletions

diff --git a/src/itoheap.h b/src/synchroheap.h
index a5aad05..4dd898d 100644
--- a/src/itoheap.h
+++ b/src/synchroheap.h
@@ -5,28 +5,25 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#ifndef BU_ITO_HEAP_H
-#define BU_ITO_HEAP_H
+#ifndef BU_SYNCHRO_HEAP_H
+#define BU_SYNCHRO_HEAP_H
 
 #include "bu/heap.h"
-#include "bu/itomutex.h"
-#include "bu/itocondition.h"
+#include "bu/mutex.h"
+#include "bu/condition.h"
 
 namespace Bu
 {
-        class ItoMutex;
-        class ItoCondition;
-
         template<typename item, typename cmpfunc=__basicLTCmp<item>,
                 typename itemalloc=std::allocator<item> >
-        class ItoHeap
+        class SynchroHeap
         {
         public:
-                ItoHeap()
+                SynchroHeap()
                 {
                 }
 
-                virtual ~ItoHeap()
+                virtual ~SynchroHeap()
                 {
                 }
 
@@ -145,8 +142,8 @@ namespace Bu
 
         private:
                 Heap< item, cmpfunc, itemalloc > hData;
-                ItoMutex imData;
-                ItoCondition icBlock;
+                Mutex imData;
+                Condition icBlock;
         };
 };