diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 05:55:32 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 05:55:59 +0200 |
| commit | 527eef2a2f0e68b286e1b782ba148ecdfafbb89c (patch) | |
| tree | 2be0f0b96df712f7b12534291db3c36564be62ca /opentrack/selected-libraries.cpp | |
| parent | 3a54a111567370ecf903704d702d12736b693a8e (diff) | |
| parent | ab47eac174db02710a7fa6c194e00c31cef755a4 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'opentrack/selected-libraries.cpp')
| -rw-r--r-- | opentrack/selected-libraries.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/opentrack/selected-libraries.cpp b/opentrack/selected-libraries.cpp index d76c0111..630b7db2 100644 --- a/opentrack/selected-libraries.cpp +++ b/opentrack/selected-libraries.cpp @@ -5,15 +5,6 @@ SelectedLibraries::~SelectedLibraries() { } -template<typename t> -static mem<t> make_instance(mem<dylib> lib) -{ - mem<t> ret; - if (lib != nullptr && lib->Constructor) - ret = mem<t>(reinterpret_cast<t*>(reinterpret_cast<OPENTRACK_CTOR_FUNPTR>(lib->Constructor)())); - return ret; -} - SelectedLibraries::SelectedLibraries(QFrame* frame, mem<ITracker> t, dylibptr p, mem<IFilter> f) : pTracker(nullptr), pFilter(nullptr), @@ -21,7 +12,7 @@ SelectedLibraries::SelectedLibraries(QFrame* frame, mem<ITracker> t, dylibptr p, correct(false) { pTracker = t; - pProtocol = make_instance<IProtocol>(p); + pProtocol = make_dylib_instance<IProtocol>(p); pFilter = f; if (!pTracker || !pProtocol) |