From: bdemsky <bdemsky@uci.edu>
Date: Wed, 10 Sep 2014 21:32:11 +0000 (-0700)
Subject: make warnings go away
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=commitdiff_plain;h=5ab6d890042234648c0baec333ed65e90ca055cf;hp=430eca5dcc20bfc89edac5c134d1c8af7a9614bc

make warnings go away
---

diff --git a/chase-lev-deque-bugfix/deque.h b/chase-lev-deque-bugfix/deque.h
index bc670e7..f474355 100644
--- a/chase-lev-deque-bugfix/deque.h
+++ b/chase-lev-deque-bugfix/deque.h
@@ -15,6 +15,7 @@ Deque * create();
 int take(Deque *q);
 void resize(Deque *q);
 void push(Deque *q, int x);
+int steal(Deque *q);
 
 #define EMPTY 0xffffffff
 #define ABORT 0xfffffffe
diff --git a/mpmc-queue/mpmc-queue.cc b/mpmc-queue/mpmc-queue.cc
index b62d8d3..7de14d5 100644
--- a/mpmc-queue/mpmc-queue.cc
+++ b/mpmc-queue/mpmc-queue.cc
@@ -18,7 +18,7 @@ void threadA(struct mpmc_boundq_1_alt<int32_t, sizeof(int32_t)> *queue)
 void threadB(struct mpmc_boundq_1_alt<int32_t, sizeof(int32_t)> *queue)
 {
 	int32_t *bin;
-	while (bin = queue->read_fetch()) {
+	while ((bin = queue->read_fetch()) != NULL) {
 		printf("Read: %d\n", load_32(bin));
 		queue->read_consume();
 	}
@@ -30,7 +30,7 @@ void threadC(struct mpmc_boundq_1_alt<int32_t, sizeof(int32_t)> *queue)
 	store_32(bin, 1);
 	queue->write_publish();
 
-	while (bin = queue->read_fetch()) {
+	while ((bin = queue->read_fetch()) != NULL) {
 		printf("Read: %d\n", load_32(bin));
 		queue->read_consume();
 	}
diff --git a/mpmc-queue/mpmc-queue.h b/mpmc-queue/mpmc-queue.h
index 918415f..47af8ea 100644
--- a/mpmc-queue/mpmc-queue.h
+++ b/mpmc-queue/mpmc-queue.h
@@ -34,7 +34,7 @@ public:
 			wr = rdwr & 0xFFFF;
 
 			if ( wr == rd ) // empty
-				return false;
+				return NULL;
 
 			if ( m_rdwr.compare_exchange_weak(rdwr,rdwr+(1<<16),mo_acq_rel) )
 				break;