diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-29 01:09:49 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-29 01:09:49 +0100 |
| commit | e29f9b9b1ede2967031255a7bd23625aedc493c3 (patch) | |
| tree | dfb9ce531ec84db3b251d15bfa800d05abfef272 /opentrack/work.hpp | |
| parent | a084a26275c1b5b0ddc5547ed230fa0b244598d6 (diff) | |
work around global 'ptr' symbol clash with opencv
Issue: #89
Reported-by: @runningman84
Diffstat (limited to 'opentrack/work.hpp')
| -rw-r--r-- | opentrack/work.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opentrack/work.hpp b/opentrack/work.hpp index 510232db5..bb9a45344 100644 --- a/opentrack/work.hpp +++ b/opentrack/work.hpp @@ -13,8 +13,8 @@ struct Work { main_settings& s; SelectedLibraries libs; - ptr<Tracker> tracker; - ptr<Shortcuts> sc; + mem<Tracker> tracker; + mem<Shortcuts> sc; WId handle; Work(main_settings& s, Mappings& m, SelectedLibraries& libs, QObject* recv, WId handle) : |