diff options
| author | Thomas Habets <thomas@habets.se> | 2020-03-14 12:01:44 +0000 |
|---|---|---|
| committer | Michael Dickens <michael.dickens@ettus.com> | 2020-04-01 11:44:45 -0400 |
| commit | 7a9169fe8cca1cb378be0d0d403e03a338ffbfda (patch) | |
| tree | fef77ae9c34538b78e4172580cb5ecdc24d40134 /gnuradio-runtime/include/gnuradio/buffer.h | |
| parent | 82262753a56d15cfa6343044c726cf0035c38d9c (diff) | |
Switch from boost pointers to std C++11 pointers
Most of this code is automated code changes:
```
set -e
SUB="s/dummy/dummy/"
for i in shared_ptr make_shared dynamic_pointer_cast weak_ptr enable_shared_from_this get_deleter; do
SUB="$SUB;s/boost::$i/std::$i/g"
done
SUB="$SUB;s^#include <boost/shared_ptr.hpp>^#include <memory>^g"
SUB="$SUB;s^namespace boost^namespace std^g"
find . \( -name "*.cc" -o -name "*.h" -o -name "*.i" -o -name "*.cxx" -o -name "*.py" \) -print0 | xargs -0 sed -i "$SUB"
```
Only one manual change. In `./gr-fec/lib/fec_mtrx_impl.cc`, add
`#include <algorithm>`.
Diffstat (limited to 'gnuradio-runtime/include/gnuradio/buffer.h')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/buffer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-runtime/include/gnuradio/buffer.h b/gnuradio-runtime/include/gnuradio/buffer.h index a0ddbc1def..3b3404a415 100644 --- a/gnuradio-runtime/include/gnuradio/buffer.h +++ b/gnuradio-runtime/include/gnuradio/buffer.h @@ -158,7 +158,7 @@ private: gr::vmcircbuf* d_vmcircbuf; size_t d_sizeof_item; // in bytes std::vector<buffer_reader*> d_readers; - boost::weak_ptr<block> d_link; // block that writes to this buffer + std::weak_ptr<block> d_link; // block that writes to this buffer // // The mutex protects d_write_index, d_abs_write_offset, d_done, d_item_tags @@ -333,10 +333,10 @@ private: int delay); buffer_sptr d_buffer; - unsigned int d_read_index; // in items [0,d->buffer.d_bufsize) - uint64_t d_abs_read_offset; // num items seen since the start - boost::weak_ptr<block> d_link; // block that reads via this buffer reader - unsigned d_attr_delay; // sample delay attribute for tag propagation + unsigned int d_read_index; // in items [0,d->buffer.d_bufsize) + uint64_t d_abs_read_offset; // num items seen since the start + std::weak_ptr<block> d_link; // block that reads via this buffer reader + unsigned d_attr_delay; // sample delay attribute for tag propagation //! constructor is private. Use gr::buffer::add_reader to create instances buffer_reader(buffer_sptr buffer, unsigned int read_index, block_sptr link); |