diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-08-01 17:18:24 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-08-01 17:18:24 +0200 |
| commit | 31edd6a85f52c855d54594dc9f8ceda694d3ebea (patch) | |
| tree | 60ad2c84d28a495082e0b083e072a934bc142634 /src/FrameMultiplexer.cpp | |
| parent | 1c25545bb03ea074b5871be3234bf0d1be20a6a3 (diff) | |
| download | dabmod-31edd6a85f52c855d54594dc9f8ceda694d3ebea.tar.gz dabmod-31edd6a85f52c855d54594dc9f8ceda694d3ebea.tar.bz2 dabmod-31edd6a85f52c855d54594dc9f8ceda694d3ebea.zip | |
Switch to C++11, remove boost::shared_ptr
Diffstat (limited to 'src/FrameMultiplexer.cpp')
| -rw-r--r-- | src/FrameMultiplexer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/FrameMultiplexer.cpp b/src/FrameMultiplexer.cpp index 843f72d..efd43f3 100644 --- a/src/FrameMultiplexer.cpp +++ b/src/FrameMultiplexer.cpp @@ -25,16 +25,15 @@ #include <stdio.h> #include <stdexcept> #include <complex> +#include <memory> #include <assert.h> #include <string.h> typedef std::complex<float> complexf; -using namespace boost; - FrameMultiplexer::FrameMultiplexer( size_t framesize, - const std::vector<shared_ptr<SubchannelSource> >* subchannels) : + const std::vector<std::shared_ptr<SubchannelSource> >* subchannels) : ModMux(ModFormat(framesize), ModFormat(framesize)), d_frameSize(framesize), mySubchannels(subchannels) @@ -79,7 +78,7 @@ int FrameMultiplexer::process(std::vector<Buffer*> dataIn, Buffer* dataOut) ++in; // Write subchannel assert(mySubchannels->size() == dataIn.size() - 1); - std::vector<shared_ptr<SubchannelSource> >::const_iterator subchannel = + std::vector<std::shared_ptr<SubchannelSource> >::const_iterator subchannel = mySubchannels->begin(); while (in != dataIn.end()) { assert((*subchannel)->framesizeCu() * 8 == (*in)->getLength()); |