diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-12-21 22:53:23 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-12-21 22:53:23 +0100 |
commit | 863d9fe32fbff286d4c359d6a5c29184ed511866 (patch) | |
tree | fdcb2c34837848db7904eb7f73890da3ff18f6fb /src/fig | |
parent | 3f179d73b72c2fcb496e5bada79a782f5d722ffe (diff) | |
download | dabmux-863d9fe32fbff286d4c359d6a5c29184ed511866.tar.gz dabmux-863d9fe32fbff286d4c359d6a5c29184ed511866.tar.bz2 dabmux-863d9fe32fbff286d4c359d6a5c29184ed511866.zip |
Replace some boost shared_ptr by std ones
Diffstat (limited to 'src/fig')
-rw-r--r-- | src/fig/FIG.h | 6 | ||||
-rw-r--r-- | src/fig/FIGCarousel.cpp | 3 | ||||
-rw-r--r-- | src/fig/FIGCarousel.h | 4 |
3 files changed, 7 insertions, 6 deletions
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 <boost/shared_ptr.hpp> +#include <memory> #include "MuxElements.h" namespace FIC { @@ -36,14 +36,14 @@ namespace FIC { class FIGRuntimeInformation { public: - FIGRuntimeInformation(boost::shared_ptr<dabEnsemble> e) : + FIGRuntimeInformation(std::shared_ptr<dabEnsemble> e) : currentFrame(0), ensemble(e), factumAnalyzer(false) {} time_t date; unsigned long currentFrame; - boost::shared_ptr<dabEnsemble> ensemble; + std::shared_ptr<dabEnsemble> 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 <boost/format.hpp> #include <iostream> +#include <memory> #include <deque> #define CAROUSELDEBUG 0 @@ -56,7 +57,7 @@ void FIGCarouselElement::increase_deadline() /**************** FIGCarousel *****************/ -FIGCarousel::FIGCarousel(boost::shared_ptr<dabEnsemble> ensemble) : +FIGCarousel::FIGCarousel(std::shared_ptr<dabEnsemble> 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 <list> #include <map> -#include <boost/shared_ptr.hpp> +#include <memory> #include "MuxElements.h" namespace FIC { @@ -58,7 +58,7 @@ enum class FIBAllocation { class FIGCarousel { public: - FIGCarousel(boost::shared_ptr<dabEnsemble> ensemble); + FIGCarousel(std::shared_ptr<dabEnsemble> ensemble); void update(unsigned long currentFrame, time_t dabTime); |