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/thread/thread.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/thread/thread.h')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/thread/thread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h index 56b0c880e7..3683c9a124 100644 --- a/gnuradio-runtime/include/gnuradio/thread/thread.h +++ b/gnuradio-runtime/include/gnuradio/thread/thread.h @@ -12,12 +12,12 @@ #define INCLUDED_THREAD_H #include <gnuradio/api.h> -#include <boost/shared_ptr.hpp> #include <boost/thread/barrier.hpp> #include <boost/thread/condition_variable.hpp> #include <boost/thread/locks.hpp> #include <boost/thread/mutex.hpp> #include <boost/thread/thread.hpp> +#include <memory> #include <vector> #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) @@ -38,7 +38,7 @@ typedef boost::mutex mutex; typedef boost::unique_lock<boost::mutex> scoped_lock; typedef boost::condition_variable condition_variable; typedef boost::barrier barrier; -typedef boost::shared_ptr<barrier> barrier_sptr; +typedef std::shared_ptr<barrier> barrier_sptr; /*! \brief a system-dependent typedef for the underlying thread type. */ |