blank lines, spacing, etc.

[model-checker.git] / libthreads.cc

diff --git a/libthreads.cc b/libthreads.cc
index a414686dccb713116bad22a1e6126f590b72cc7b..28982582eb15fadf2e3f4d5a5152ca0e26489ef3 100644 (file)
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -17,23 +17,22 @@ int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
        ret = model->add_thread(thread);
        DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
        /* seq_cst is just a 'don't care' parameter */
-       model->switch_to_master(new ModelAction(THREAD_CREATE, memory_order_seq_cst, thread, VALUE_NONE));
+       model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, thread, VALUE_NONE));
        return ret;
 }
 
 int thrd_join(thrd_t t)
 {
-       int ret = 0;
        Thread *th = model->get_thread(thrd_to_id(t));
-       while (th->get_state() != THREAD_COMPLETED && !ret)
-               ret = model->switch_to_master(NULL);
-       return ret;
+       while (th->get_state() != THREAD_COMPLETED)
+               model->switch_to_master(NULL);
+       return 0;
 }
 
 int thrd_yield(void)
 {
        /* seq_cst is just a 'don't care' parameter */
-       return model->switch_to_master(new ModelAction(THREAD_YIELD, memory_order_seq_cst, NULL, VALUE_NONE));
+       return model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, NULL, VALUE_NONE));
 }
 
 thrd_t thrd_current(void)