From 1e94e304c33536e2581ba311879d436c4f4ee493 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Mon, 12 Sep 2022 21:48:32 +0200 Subject: [PATCH] eitd/sectionsd: remove USE_BOOST_SHARED_PTR Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/97250fe9a20c381a9b0d7fd0feb6b3c9dfadfcf6 Author: Frankenstone Date: 2022-09-12 (Mon, 12 Sep 2022) Origin message was: ------------------ - eitd/sectionsd: remove USE_BOOST_SHARED_PTR ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/eitd/eitd.h | 8 +------- src/eitd/sectionsd.cpp | 7 ++----- 2 files changed, 3 insertions(+), 12 deletions(-) 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();