Merge remote-tracking branch 'origin/master'

[model-checker.git] / libthreads.cc

diff --git a/libthreads.cc b/libthreads.cc
index 4d6a0243c53b7fe880952747236bd8327c04a108..2b2bf85ac374b2a57ab85b2ddfb82f184c6372ea 100644 (file)
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,6 @@
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /* global "model" object */
 #include "model.h"
@@ -23,7 +23,7 @@ int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 int thrd_join(thrd_t t)
 {
        Thread *th = model->get_thread(thrd_to_id(t));
-       model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, thrd_to_id(t)));
+       model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(thrd_to_id(t))));
        return 0;
 }