changes

[IRC.git] / Robust / src / Runtime / oooJava / hashStructure.h

diff --git a/Robust/src/Runtime/oooJava/hashStructure.h b/Robust/src/Runtime/oooJava/hashStructure.h
index 67716af6edaa4670386648d3a62ba404a4bb1b86..1bcde9e7d33edbdf1ebf1985781cee92f0fe21b6 100644 (file)
--- a/Robust/src/Runtime/oooJava/hashStructure.h
+++ b/Robust/src/Runtime/oooJava/hashStructure.h
@@ -2,7 +2,7 @@
 #define HASHSTRUCTURE_H_\r
 \r
 #include "mlp_runtime.h"\r
-#include "WaitingQueue.h"\r
+//#include "WaitingQueue.h"\r
 \r
 #define ITEM_NOT_AT_FRONT_OF_WAITINGQ 3\r
 #define TRAVERSER_FINISHED 2\r
@@ -26,7 +26,7 @@
 #define RNUMBINS 64\r
 #define RNUMREAD 64\r
 #define RNUMRENTRY 256\r
-#define RH_MASK (RNUMBINS<<4)-1\r
+#define RH_MASK (RNUMBINS)-1\r
 \r
 //Note: put resolved things at the end and unresolved at the front.\r
 typedef struct BinItem_rcr {\r
@@ -65,7 +65,7 @@ typedef struct BinElement_rcr {
 \r
 typedef struct Hashtable_rcr {\r
   BinElement_rcr array[RNUMBINS];\r
-  WaitingQueueBin * waitingQueue;\r
+  //  WaitingQueueBin * waitingQueue;\r
 } HashStructure;\r
 \r
 //Todo this is a clone of REntry, remove data fields as necessary\r