From 5ab6d890042234648c0baec333ed65e90ca055cf Mon Sep 17 00:00:00 2001 From: bdemsky Date: Wed, 10 Sep 2014 14:32:11 -0700 Subject: [PATCH] make warnings go away --- chase-lev-deque-bugfix/deque.h | 1 + mpmc-queue/mpmc-queue.cc | 4 ++-- mpmc-queue/mpmc-queue.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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 *queue) void threadB(struct mpmc_boundq_1_alt *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 *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; -- 2.34.1