From e29f9b9b1ede2967031255a7bd23625aedc493c3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 29 Oct 2014 01:09:49 +0100
Subject: work around global 'ptr' symbol clash with opencv

Issue: #89
Reported-by: @runningman84
---
 opentrack/plugin-support.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'opentrack/plugin-support.h')

diff --git a/opentrack/plugin-support.h b/opentrack/plugin-support.h
index 2c66f1d5..ad3f2af8 100644
--- a/opentrack/plugin-support.h
+++ b/opentrack/plugin-support.h
@@ -10,7 +10,7 @@
 #include <QList>
 
 #include <memory>
-template<typename t> using ptr = std::shared_ptr<t>;
+template<typename t> using mem = std::shared_ptr<t>;
 
 extern "C" typedef void* (*CTOR_FUNPTR)(void);
 extern "C" typedef Metadata* (*METADATA_FUNPTR)(void);
@@ -20,7 +20,7 @@ struct dylib {
     
     dylib(const QString& filename, Type t);
     ~dylib();
-    static QList<ptr<dylib>> enum_libraries();
+    static QList<mem<dylib>> enum_libraries();
     
     Type type;
     QString filename;
@@ -40,12 +40,12 @@ private:
 };
 
 struct SelectedLibraries {
-    using dylibptr = ptr<dylib>;
-    ptr<ITracker> pTracker;
-    ptr<IFilter> pFilter;
-    ptr<IProtocol> pProtocol;
+    using dylibptr = mem<dylib>;
+    mem<ITracker> pTracker;
+    mem<IFilter> pFilter;
+    mem<IProtocol> pProtocol;
     SelectedLibraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f);
     SelectedLibraries() : pTracker(nullptr), pFilter(nullptr), pProtocol(nullptr), correct(false) {}
     ~SelectedLibraries();
     bool correct;
-};
\ No newline at end of file
+};
-- 
cgit v1.2.3