summaryrefslogtreecommitdiffstats
path: root/fastos/src/tests/job.h
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2017-11-02 09:12:01 +0100
committerGitHub <noreply@github.com>2017-11-02 09:12:01 +0100
commit38b8820859134c1abc761e136f83b6d43b89ecf3 (patch)
treed0915317722d40ce4ad4193f32d0522579af475b /fastos/src/tests/job.h
parent68396f1ed32d73a145d1cb1413a92f1b53adf937 (diff)
Revert "Revert "Toregge/use standard locks in fastos""
Diffstat (limited to 'fastos/src/tests/job.h')
-rw-r--r--fastos/src/tests/job.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/fastos/src/tests/job.h b/fastos/src/tests/job.h
index a5b84fa0f9c..1d35ec95270 100644
--- a/fastos/src/tests/job.h
+++ b/fastos/src/tests/job.h
@@ -2,6 +2,9 @@
#pragma once
+#include <mutex>
+#include <condition_variable>
+
enum JobCode
{
PRINT_MESSAGE_AND_WAIT3SEC,
@@ -28,9 +31,8 @@ private:
public:
JobCode code;
char *message;
- FastOS_Mutex *mutex;
- FastOS_Cond *condition;
- FastOS_BoolCond *boolcondition;
+ std::mutex *mutex;
+ std::condition_variable *condition;
FastOS_ThreadInterface *otherThread, *ownThread;
double *timebuf;
double average;
@@ -45,7 +47,6 @@ public:
message(nullptr),
mutex(nullptr),
condition(nullptr),
- boolcondition(nullptr),
otherThread(nullptr),
ownThread(nullptr),
timebuf(nullptr),