mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd/sectionsd: remove USE_BOOST_SHARED_PTR

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97250fe9a2
Author: Frankenstone <dampf_acc@online.de>
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
This commit is contained in:
Frankenstone
2022-09-12 21:48:32 +02:00
committed by vanhofen
parent 81b78aa081
commit 1e94e304c3
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/eitd/eitd.h
View File

@@ -38,15 +38,9 @@
#include "SIsections.hpp" #include "SIsections.hpp"
#include "SIlanguage.hpp" #include "SIlanguage.hpp"
#include "debug.h" #include "debug.h"
//#define USE_BOOST_SHARED_PTR
#ifdef USE_BOOST_SHARED_PTR
#include <boost/shared_ptr.hpp>
typedef boost::shared_ptr<class SIevent> SIeventPtr;
typedef boost::shared_ptr<class SIservice> SIservicePtr;
#else
typedef SIevent * SIeventPtr; typedef SIevent * SIeventPtr;
typedef SIservice * SIservicePtr; typedef SIservice * SIservicePtr;
#endif
/* period to restart EIT reading */ /* period to restart EIT reading */
#define TIME_EIT_SCHEDULED_PAUSE 60 * 60 #define TIME_EIT_SCHEDULED_PAUSE 60 * 60

7
src/eitd/sectionsd.cpp
View File

@@ -249,10 +249,8 @@ static bool deleteEvent(const t_event_id uniqueKey)
mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.erase(e->second); mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.erase(e->second);
mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.erase(e->second); mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.erase(e->second);
} }
#ifndef USE_BOOST_SHARED_PTR
delete e->second; delete e->second;
#endif
mySIeventsOrderUniqueKey.erase(uniqueKey); mySIeventsOrderUniqueKey.erase(uniqueKey);
mySIeventsNVODorderUniqueKey.erase(uniqueKey); mySIeventsNVODorderUniqueKey.erase(uniqueKey);
ret = true; ret = true;
@@ -1177,7 +1175,6 @@ static void FreeMemory()
writeLockEvents(); writeLockEvents();
#ifndef USE_BOOST_SHARED_PTR
std::set<SIeventPtr> allevents; std::set<SIeventPtr> allevents;
allevents.insert(mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.begin(), mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.end()); allevents.insert(mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.begin(), mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.end());
@@ -1192,7 +1189,7 @@ static void FreeMemory()
for(std::set<SIeventPtr>::iterator ait = allevents.begin(); ait != allevents.end(); ++ait) for(std::set<SIeventPtr>::iterator ait = allevents.begin(); ait != allevents.end(); ++ait)
delete (*ait); delete (*ait);
#endif
mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.clear(); mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.clear();
mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.clear(); mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.clear();
mySIeventsOrderUniqueKey.clear(); mySIeventsOrderUniqueKey.clear();