X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;h=9ab2f2858d485b5140ae99954d26414154d2fe55;hb=a7df00de36ef87549b654cfbc5c6b098cbba7a5b;hp=e5bc9018477a469288cb60235a8661ad31012d28;hpb=82f6d9ab97a87e874fb1b5dfa237266f4bfc95d1;p=c11tester.git

diff --git a/pthread.cc b/pthread.cc
index e5bc9018..9ab2f285 100644
--- a/pthread.cc
+++ b/pthread.cc
@@ -16,10 +16,6 @@
 
 static void param_defaults(struct model_params *params)
 {
-        params->maxreads = 0;
-        params->fairwindow = 0;
-        params->yieldon = false;
-        params->yieldblock = false;
         params->enabledcount = 1;
         params->bound = 0;
         params->verbose = !!DBG_ENABLED();
@@ -198,7 +194,7 @@ int pthread_cond_timedwait(pthread_cond_t *p_cond,
 	cdsc::condition_variable *v = execution->getCondMap()->get(p_cond);
 	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
 
-	model->switch_to_master(new ModelAction(NOOP, std::memory_order_seq_cst, v, NULL));
+	model->switch_to_master(new ModelAction(NOOP, std::memory_order_seq_cst, v));
 //	v->wait(*m);
 //	printf("timed_wait called\n");
 	return 0;