From cb38011818063ac2b28fb09c9e34b2fc3a558988 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 10 Jun 2015 19:02:48 +0200
Subject: pt: issue with duplicate symbols on including dshow.h in two files
Let's work around it by including dshow.h in only one file
---
opentrack/camera-names.hpp | 3 ---
1 file changed, 3 deletions(-)
(limited to 'opentrack')
diff --git a/opentrack/camera-names.hpp b/opentrack/camera-names.hpp
index d6b26493..3d3948fa 100644
--- a/opentrack/camera-names.hpp
+++ b/opentrack/camera-names.hpp
@@ -13,8 +13,6 @@
# include <unistd.h>
#endif
-// template to allow compiler coalesce function at linking with multiple definitions
-template<typename = int>
QList<QString> get_camera_names() {
QList<QString> ret;
#if defined(_WIN32)
@@ -84,7 +82,6 @@ QList<QString> get_camera_names() {
return ret;
}
-template<typename = int>
int camera_name_to_index(const QString &name)
{
auto list = get_camera_names();
--
cgit v1.2.3