summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2016-12-15 15:53:02 (GMT)
committerStefan Radomski <github@mintwerk.de>2016-12-15 15:53:02 (GMT)
commit75fc3b465fb3d61d36874cf7a29ddbb8256e3817 (patch)
tree0015a3cf6296eddc85fbbbf118ddf0d1c2dc8f0e /src
parent7c7b9653f843588ae60d92c6f7d1477d7bbc5f05 (diff)
parentf00f348c559984f27032413ced4e56ae48bd8214 (diff)
downloaduscxml-75fc3b465fb3d61d36874cf7a29ddbb8256e3817.zip
uscxml-75fc3b465fb3d61d36874cf7a29ddbb8256e3817.tar.gz
uscxml-75fc3b465fb3d61d36874cf7a29ddbb8256e3817.tar.bz2
Merge branch 'master' of github.com:tklab-tud/uscxml
Diffstat (limited to 'src')
-rw-r--r--src/uscxml/debug/DebugSession.h1
-rw-r--r--src/uscxml/util/URL.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/uscxml/debug/DebugSession.h b/src/uscxml/debug/DebugSession.h
index c5ed7e5..9224163 100644
--- a/src/uscxml/debug/DebugSession.h
+++ b/src/uscxml/debug/DebugSession.h
@@ -28,6 +28,7 @@
#include <set>
#include <thread>
#include <condition_variable>
+#include <mutex>
namespace uscxml {
diff --git a/src/uscxml/util/URL.h b/src/uscxml/util/URL.h
index b3f486a..c83e3b1 100644
--- a/src/uscxml/util/URL.h
+++ b/src/uscxml/util/URL.h
@@ -30,7 +30,7 @@
#include <list>
#include <thread>
#include <condition_variable>
-
+#include <mutex>
namespace uscxml {
class URL;