projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change the namespace of mutex from std to cdsc
[c11tester.git]
/
execution.h
diff --git
a/execution.h
b/execution.h
index 5f5fd0a2b54c1b02f8b2efb86bce45f37f2f802c..fdc226b44e73389468d4eb82540c9e49e717ddea 100644
(file)
--- a/
execution.h
+++ b/
execution.h
@@
-16,7
+16,8
@@
#include "stl-model.h"
#include "params.h"
#include "stl-model.h"
#include "params.h"
-#include <mutex>
+#include "mutex.h"
+#include <condition_variable>
/* Forward declaration */
class Node;
/* Forward declaration */
class Node;
@@
-125,7
+126,8
@@
public:
CycleGraph * const get_mo_graph() { return mo_graph; }
CycleGraph * const get_mo_graph() { return mo_graph; }
- HashTable<pthread_mutex_t *, std::mutex *, uintptr_t, 4> mutex_map;
+ HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> mutex_map;
+ HashTable<pthread_cond_t *, cdsc::condition_variable *, uintptr_t, 4> cond_map;
SNAPSHOTALLOC
private:
SNAPSHOTALLOC
private:
@@
-218,7
+220,7
@@
private:
HashTable<void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
HashTable<void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
-// HashTable<pthread_mutex_t *,
std
::mutex *, uintptr_t, 4> mutex_map;
+// HashTable<pthread_mutex_t *,
cdsc
::mutex *, uintptr_t, 4> mutex_map;
/**
* @brief List of currently-pending promises
/**
* @brief List of currently-pending promises