spsc-queue: compilable

diff --git a/Makefile b/Makefile
index 6b08fb0401d8e5b2eac1647c93f7a94f3ec146de..e5ff6cc72901ded97d33e57e75bd2a780e280bf6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DIRS := barrier mcs-lock mpmc-queue
+DIRS := barrier mcs-lock mpmc-queue spsc-queue
 
 .PHONY: $(DIRS)
 

diff --git a/spsc-queue/eventcount.h b/spsc-queue/eventcount.h
index 4390cc5b0e3737c58c1087e6825dbf5ffbd2d4bd..aec3e8c9b216b9d71c9b561287d7d95828386f1a 100644 (file)
--- a/spsc-queue/eventcount.h
+++ b/spsc-queue/eventcount.h
@@ -40,7 +40,7 @@ std::memory_order_seq_cst);
                        if (cmp == (ec & 0x7FFFFFFF))
                        {
                                waiters += 1;
-                               cv.wait(guard, $);
+                               cv.wait(guard);
                        }
                        guard.unlock($);
                }
@@ -50,7 +50,7 @@ private:
        std::atomic<unsigned> count;
        rl::var<unsigned> waiters;
        std::mutex guard;
-       std::condition_variable_any cv;
+       std::condition_variable cv;
 
        void signal_impl(unsigned cmp)
        {

diff --git a/spsc-queue/spsc-queue.cc b/spsc-queue/spsc-queue.cc
index ef7b02635d8f1e525d14191b9ba6b85b33fe7ec2..b689936ae6918411da1c3192e28137ce122ca911 100644 (file)
--- a/spsc-queue/spsc-queue.cc
+++ b/spsc-queue/spsc-queue.cc
@@ -17,7 +17,7 @@ spsc_queue<int> q;
                }
        }
 
-int main()
+int user_main(int argc, char **argv)
 {
        thrd_t A, B;
        thrd_create(&A, (thrd_start_t)&thread, (void *)0);