make warnings go away

diff --git a/chase-lev-deque-bugfix/deque.h b/chase-lev-deque-bugfix/deque.h
index bc670e7ef1e540d56b2e043fe1b11b48f396b91a..f474355dbe6bc27a049bf6f6a434fc87449ca565 100644 (file)
--- 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 take(Deque *q);
 void resize(Deque *q);
 void push(Deque *q, int x);

+int steal(Deque *q);

 
 #define EMPTY 0xffffffff
 #define ABORT 0xfffffffe
 
 #define EMPTY 0xffffffff
 #define ABORT 0xfffffffe

diff --git a/mpmc-queue/mpmc-queue.cc b/mpmc-queue/mpmc-queue.cc
index b62d8d31f496bce7a686332aad23ef7140e56653..7de14d589c5819b9055618928eae43accc2f15bd 100644 (file)
--- 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;
 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();
        }
                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();
 
        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();
        }
                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 918415fa99278e0a8cc3d47622f84de00749445c..47af8eab37b7509ca8e257e118c5b7e38ec8278a 100644 (file)
--- a/mpmc-queue/mpmc-queue.h
+++ b/mpmc-queue/mpmc-queue.h
@@ -34,7 +34,7 @@ public:
                        wr = rdwr & 0xFFFF;
 
                        if ( wr == rd ) // empty
                        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;
 
                        if ( m_rdwr.compare_exchange_weak(rdwr,rdwr+(1<<16),mo_acq_rel) )
                                break;