diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-09-22 15:19:01 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-09-22 15:19:01 +0200 |
| commit | 350edf6e5c1f253a300fd0b7db6591082558d937 (patch) | |
| tree | a6787e1e3c7243da416f1dc9828f113cbbdcbaa4 /ftnoir_protocol_ft | |
| parent | a42c19579c5c7a980c2826c7e015821d2e4d4b1d (diff) | |
needless compat api breakage
Diffstat (limited to 'ftnoir_protocol_ft')
| -rw-r--r-- | ftnoir_protocol_ft/ftnoir_protocol_ft.cpp | 4 | ||||
| -rw-r--r-- | ftnoir_protocol_ft/ftnoir_protocol_ft.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp index d0cbfa97..8b8be63d 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp @@ -28,9 +28,9 @@ #include "ftnoir_csv/csv.h" FTNoIR_Protocol::FTNoIR_Protocol() : - shm(FT_MM_DATA, FREETRACK_MUTEX, sizeof(FTHeap)) + shm(FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap)) { - pMemData = (FTHeap*) shm.mem; + pMemData = (FTHeap*) shm.ptr(); ProgramName = ""; intGameID = 0; viewsStart = 0; diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h index d7a792b7..dc534fda 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h @@ -27,7 +27,6 @@ #pragma once #include "ui_ftnoir_ftcontrols.h" #include "facetracknoir/plugin-api.hpp" -#include "fttypes.h" #include <QMessageBox> #include <QSettings> #include <QLibrary> @@ -39,6 +38,7 @@ #include <QMutexLocker> #include "compat/compat.h" #include "facetracknoir/options.h" +#include "fttypes.h" using namespace options; struct settings { |