diff --git a/src/eitd/eitd.h b/src/eitd/eitd.h index a35c59e05..1bcd92a9a 100644 --- a/src/eitd/eitd.h +++ b/src/eitd/eitd.h @@ -38,15 +38,9 @@ #include "SIsections.hpp" #include "SIlanguage.hpp" #include "debug.h" -//#define USE_BOOST_SHARED_PTR -#ifdef USE_BOOST_SHARED_PTR -#include -typedef boost::shared_ptr SIeventPtr; -typedef boost::shared_ptr SIservicePtr; -#else + typedef SIevent * SIeventPtr; typedef SIservice * SIservicePtr; -#endif /* period to restart EIT reading */ #define TIME_EIT_SCHEDULED_PAUSE 60 * 60 diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index f1bc0c587..05ebd7896 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -249,10 +249,8 @@ static bool deleteEvent(const t_event_id uniqueKey) mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.erase(e->second); mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.erase(e->second); } - -#ifndef USE_BOOST_SHARED_PTR delete e->second; -#endif + mySIeventsOrderUniqueKey.erase(uniqueKey); mySIeventsNVODorderUniqueKey.erase(uniqueKey); ret = true; @@ -1177,7 +1175,6 @@ static void FreeMemory() writeLockEvents(); -#ifndef USE_BOOST_SHARED_PTR std::set allevents; allevents.insert(mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.begin(), mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.end()); @@ -1192,7 +1189,7 @@ static void FreeMemory() for(std::set::iterator ait = allevents.begin(); ait != allevents.end(); ++ait) delete (*ait); -#endif + mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.clear(); mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.clear(); mySIeventsOrderUniqueKey.clear();