From 487d180ee0dcb89b70a485a0d1fd9ad2de96cc4a Mon Sep 17 00:00:00 2001 From: randomdan Date: Sat, 4 Jan 2014 18:52:36 +0000 Subject: Explicit instantiations of instance store/map/set to avoid multiple instantiatation in different compilation units --- p2pvr/lib/frontend.cpp | 3 +++ p2pvr/lib/pch.hpp | 1 + p2pvr/lib/schedules.cpp | 3 +++ 3 files changed, 7 insertions(+) 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 #include #include +#include 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 +#include #include #include #include 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 +#include 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); + -- cgit v1.2.3