summaryrefslogtreecommitdiffhomepage
path: root/proto-ft/ftnoir_protocol_ft.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-06-18 18:27:49 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-06-18 18:48:42 +0200
commite92d209598e115acc9ed7bf90bed61be80238536 (patch)
treef50e95f762d4f6844f0b4d5c13f7ffe60a188903 /proto-ft/ftnoir_protocol_ft.h
parente88c7b29ea9ec9fcd6ac6b15c965085152100d2e (diff)
proto/ft: use explicit atomic load/store
"volatile" is too underspecified. Also cleanup some old code.
Diffstat (limited to 'proto-ft/ftnoir_protocol_ft.h')
-rw-r--r--proto-ft/ftnoir_protocol_ft.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/proto-ft/ftnoir_protocol_ft.h b/proto-ft/ftnoir_protocol_ft.h
index e5a63e17..5b8e848f 100644
--- a/proto-ft/ftnoir_protocol_ft.h
+++ b/proto-ft/ftnoir_protocol_ft.h
@@ -18,12 +18,16 @@
#include <QString>
#include <QMutex>
#include <QMutexLocker>
+
+#include <cinttypes>
+#include "freetrackclient/fttypes.h"
+
#include "compat/shm.h"
#include "options/options.hpp"
-#include "freetrackclient/fttypes.h"
-#include <memory>
#include "mutex.hpp"
+#include <memory>
+
using namespace options;
struct settings : opts {
@@ -54,7 +58,7 @@ public:
private:
settings s;
PortableLockedShm shm;
- FTHeap *pMemData;
+ FTHeap volatile *pMemData;
QLibrary FTIRViewsLib;
QProcess dummyTrackIR;