From ae1e51950d28aad23f47611cd9afb33718b4beec Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Fri, 12 Oct 2012 10:44:01 -0700
Subject: [PATCH] spsc-queue: compilable

---
 Makefile                 | 2 +-
 spsc-queue/eventcount.h  | 4 ++--
 spsc-queue/spsc-queue.cc | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6b08fb0..e5ff6cc 100644
--- 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 4390cc5..aec3e8c 100644
--- 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 ef7b026..b689936 100644
--- 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);
-- 
2.34.1