summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2014-01-04 18:52:36 +0000
committerrandomdan <randomdan@localhost>2014-01-04 18:52:36 +0000
commit487d180ee0dcb89b70a485a0d1fd9ad2de96cc4a (patch)
tree2f771be2919d813288646b3bf0a023a22f46c435
parentLog exceptions in scan frequency found handler (diff)
downloadp2pvr-487d180ee0dcb89b70a485a0d1fd9ad2de96cc4a.tar.bz2
p2pvr-487d180ee0dcb89b70a485a0d1fd9ad2de96cc4a.tar.xz
p2pvr-487d180ee0dcb89b70a485a0d1fd9ad2de96cc4a.zip
Explicit instantiations of instance store/map/set to avoid multiple instantiatation in different compilation units
-rw-r--r--p2pvr/lib/frontend.cpp3
-rw-r--r--p2pvr/lib/pch.hpp1
-rw-r--r--p2pvr/lib/schedules.cpp3
3 files changed, 7 insertions, 0 deletions
diff --git a/p2pvr/lib/frontend.cpp b/p2pvr/lib/frontend.cpp
index f09789f..54870a1 100644
--- a/p2pvr/lib/frontend.cpp
+++ b/p2pvr/lib/frontend.cpp
@@ -4,6 +4,7 @@
#include <logger.h>
#include <sys/ioctl.h>
#include <linux/dvb/frontend.h>
+#include <instanceStore.impl.h>
Frontend::Frontend(Tuner * t, int fd, const struct dvb_frontend_info & i) :
tuner(t),
@@ -34,3 +35,5 @@ Frontend::GetStatus() const
return status;
}
+INSTANTIATESTORE(fe_type, FrontendLoader);
+
diff --git a/p2pvr/lib/pch.hpp b/p2pvr/lib/pch.hpp
index 34c2388..36ccd9c 100644
--- a/p2pvr/lib/pch.hpp
+++ b/p2pvr/lib/pch.hpp
@@ -3,6 +3,7 @@
#define P2PVRLIB_PCH
#include <Ice/Ice.h>
+#include <glibmm.h>
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
#include <boost/function.hpp>
diff --git a/p2pvr/lib/schedules.cpp b/p2pvr/lib/schedules.cpp
index 31d5788..f6fedc2 100644
--- a/p2pvr/lib/schedules.cpp
+++ b/p2pvr/lib/schedules.cpp
@@ -10,6 +10,7 @@
#include "containerIterator.h"
#include "resources.h"
#include <boost/date_time/posix_time/posix_time.hpp>
+#include <instanceStore.impl.h>
ResourceString(Schedules_GetCandidates, lib_sql_Schedules_GetCandidates_sql);
ResourceString(Schedules_insert, lib_sql_Schedules_insert_sql);
@@ -428,3 +429,5 @@ Schedules::UpdateSchedule(const P2PVR::SchedulePtr & s, const Ice::Current & ice
return s->ScheduleId;
}
+INSTANTIATESTORE(std::string, EpisodeGroupLoader);
+