From 863d9fe32fbff286d4c359d6a5c29184ed511866 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 21 Dec 2015 22:53:23 +0100 Subject: Replace some boost shared_ptr by std ones --- src/fig/FIG.h | 6 +++--- src/fig/FIGCarousel.cpp | 3 ++- src/fig/FIGCarousel.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/fig') diff --git a/src/fig/FIG.h b/src/fig/FIG.h index c1a5ae3..1c1ab8e 100644 --- a/src/fig/FIG.h +++ b/src/fig/FIG.h @@ -27,7 +27,7 @@ #ifndef __FIG_H_ #define __FIG_H_ -#include +#include #include "MuxElements.h" namespace FIC { @@ -36,14 +36,14 @@ namespace FIC { class FIGRuntimeInformation { public: - FIGRuntimeInformation(boost::shared_ptr e) : + FIGRuntimeInformation(std::shared_ptr e) : currentFrame(0), ensemble(e), factumAnalyzer(false) {} time_t date; unsigned long currentFrame; - boost::shared_ptr ensemble; + std::shared_ptr ensemble; bool factumAnalyzer; }; diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp index c9daddf..5e1e82f 100644 --- a/src/fig/FIGCarousel.cpp +++ b/src/fig/FIGCarousel.cpp @@ -31,6 +31,7 @@ #include "fig/FIGCarousel.h" #include #include +#include #include #define CAROUSELDEBUG 0 @@ -56,7 +57,7 @@ void FIGCarouselElement::increase_deadline() /**************** FIGCarousel *****************/ -FIGCarousel::FIGCarousel(boost::shared_ptr ensemble) : +FIGCarousel::FIGCarousel(std::shared_ptr ensemble) : m_rti(ensemble), m_fig0_0(&m_rti), m_fig0_1(&m_rti), diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h index bb6b546..738a302 100644 --- a/src/fig/FIGCarousel.h +++ b/src/fig/FIGCarousel.h @@ -34,7 +34,7 @@ #include "fig/FIG1.h" #include #include -#include +#include #include "MuxElements.h" namespace FIC { @@ -58,7 +58,7 @@ enum class FIBAllocation { class FIGCarousel { public: - FIGCarousel(boost::shared_ptr ensemble); + FIGCarousel(std::shared_ptr ensemble); void update(unsigned long currentFrame, time_t dabTime); -- cgit v1.2.3