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/FIRFilter.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/FIRFilter.cpp')
-rw-r--r-- | src/FIRFilter.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/FIRFilter.cpp b/src/FIRFilter.cpp index b1ce618..9ef49c5 100644 --- a/src/FIRFilter.cpp +++ b/src/FIRFilter.cpp @@ -35,8 +35,7 @@ #include <iostream> #include <fstream> - -#include <boost/make_shared.hpp> +#include <memory> #ifdef __AVX__ # include <immintrin.h> @@ -60,10 +59,10 @@ void FIRFilterWorker::process(struct FIRFilterWorkerData *fwd) // the incoming buffer while(running) { - boost::shared_ptr<Buffer> dataIn; + std::shared_ptr<Buffer> dataIn; fwd->input_queue.wait_and_pop(dataIn); - boost::shared_ptr<Buffer> dataOut = boost::make_shared<Buffer>(); + std::shared_ptr<Buffer> dataOut = make_shared<Buffer>(); dataOut->setLength(dataIn->getLength()); PDEBUG("FIRFilterWorker: dataIn->getLength() %zu\n", dataIn->getLength()); @@ -393,13 +392,13 @@ int FIRFilter::process(Buffer* const dataIn, Buffer* dataOut) // This thread creates the dataIn buffer, and deletes // the outgoing buffer - boost::shared_ptr<Buffer> inbuffer = - boost::make_shared<Buffer>(dataIn->getLength(), dataIn->getData()); + std::shared_ptr<Buffer> inbuffer = + make_shared<Buffer>(dataIn->getLength(), dataIn->getData()); firwd.input_queue.push(inbuffer); if (number_of_runs > 2) { - boost::shared_ptr<Buffer> outbuffer; + std::shared_ptr<Buffer> outbuffer; firwd.output_queue.wait_and_pop(outbuffer); dataOut->setData(outbuffer->getData(), outbuffer->getLength()); |