From 31edd6a85f52c855d54594dc9f8ceda694d3ebea Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sat, 1 Aug 2015 17:18:24 +0200 Subject: Switch to C++11, remove boost::shared_ptr --- src/FrameMultiplexer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/FrameMultiplexer.cpp') 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 #include #include +#include #include #include typedef std::complex complexf; -using namespace boost; - FrameMultiplexer::FrameMultiplexer( size_t framesize, - const std::vector >* subchannels) : + const std::vector >* subchannels) : ModMux(ModFormat(framesize), ModFormat(framesize)), d_frameSize(framesize), mySubchannels(subchannels) @@ -79,7 +78,7 @@ int FrameMultiplexer::process(std::vector dataIn, Buffer* dataOut) ++in; // Write subchannel assert(mySubchannels->size() == dataIn.size() - 1); - std::vector >::const_iterator subchannel = + std::vector >::const_iterator subchannel = mySubchannels->begin(); while (in != dataIn.end()) { assert((*subchannel)->framesizeCu() * 8 == (*in)->getLength()); -- cgit v1.2.3