diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-06-17 12:14:00 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-06-22 09:35:48 -0400 |
| commit | 5ed43ed63b20d74a2641c8d1e547f84cd98179e4 (patch) | |
| tree | 60afaa24b0a9f5d3ab657dc21c7ca8721a4dc4a2 | |
| parent | 54ff6375bdec9fc2c202604fa648784f486d0433 (diff) | |
runtime: cleaning up unspecific/mistaken boost dependencies
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/high_res_timer.h | 5 | ||||
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/thread/thread_group.h | 3 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/hier_block2_detail.h | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/pmt/pmt_int.h | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/scheduler.h | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/high_res_timer_python.cc | 2 |
6 files changed, 7 insertions, 11 deletions
diff --git a/gnuradio-runtime/include/gnuradio/high_res_timer.h b/gnuradio-runtime/include/gnuradio/high_res_timer.h index c945781156..d0b002f7c1 100644 --- a/gnuradio-runtime/include/gnuradio/high_res_timer.h +++ b/gnuradio-runtime/include/gnuradio/high_res_timer.h @@ -12,6 +12,7 @@ #define INCLUDED_GNURADIO_HIGH_RES_TIMER_H #include <gnuradio/api.h> +#include <boost/date_time/posix_time/posix_time.hpp> //////////////////////////////////////////////////////////////////////// // Use architecture defines to determine the implementation @@ -123,8 +124,6 @@ inline gr::high_res_timer_type gr::high_res_timer_tps(void) //////////////////////////////////////////////////////////////////////// #ifdef GNURADIO_HRT_USE_MICROSEC_CLOCK -#include <boost/date_time/posix_time/posix_time.hpp> - inline gr::high_res_timer_type gr::high_res_timer_now(void) { static const boost::posix_time::ptime epoch(boost::posix_time::from_time_t(0)); @@ -143,8 +142,6 @@ inline gr::high_res_timer_type gr::high_res_timer_tps(void) #endif //////////////////////////////////////////////////////////////////////// -#include <boost/date_time/posix_time/posix_time.hpp> - inline gr::high_res_timer_type gr::high_res_timer_epoch(void) { static const double hrt_ticks_per_utc_ticks = diff --git a/gnuradio-runtime/include/gnuradio/thread/thread_group.h b/gnuradio-runtime/include/gnuradio/thread/thread_group.h index 4dbce3d0c0..9895068373 100644 --- a/gnuradio-runtime/include/gnuradio/thread/thread_group.h +++ b/gnuradio-runtime/include/gnuradio/thread/thread_group.h @@ -17,9 +17,10 @@ #include <gnuradio/api.h> #include <gnuradio/thread/thread.h> +#include <boost/any.hpp> +#include <boost/core/noncopyable.hpp> #include <boost/function.hpp> #include <boost/thread/shared_mutex.hpp> -#include <boost/utility.hpp> #include <memory> namespace gr { diff --git a/gnuradio-runtime/lib/hier_block2_detail.h b/gnuradio-runtime/lib/hier_block2_detail.h index c7cfa2b72d..35da1f922d 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.h +++ b/gnuradio-runtime/lib/hier_block2_detail.h @@ -14,7 +14,7 @@ #include <gnuradio/api.h> #include <gnuradio/hier_block2.h> #include <flat_flowgraph.h> -#include <boost/utility.hpp> +#include <boost/core/noncopyable.hpp> namespace gr { diff --git a/gnuradio-runtime/lib/pmt/pmt_int.h b/gnuradio-runtime/lib/pmt/pmt_int.h index 13c42968f2..7aadefe4d7 100644 --- a/gnuradio-runtime/lib/pmt/pmt_int.h +++ b/gnuradio-runtime/lib/pmt/pmt_int.h @@ -11,9 +11,7 @@ #define INCLUDED_PMT_INT_H #include <pmt/pmt.h> -#include <boost/atomic.hpp> -#include <boost/utility.hpp> -#include <boost/version.hpp> +#include <boost/any.hpp> /* * EVERYTHING IN THIS FILE IS PRIVATE TO THE IMPLEMENTATION! diff --git a/gnuradio-runtime/lib/scheduler.h b/gnuradio-runtime/lib/scheduler.h index e56f0bfb19..3eec1e8df9 100644 --- a/gnuradio-runtime/lib/scheduler.h +++ b/gnuradio-runtime/lib/scheduler.h @@ -14,7 +14,7 @@ #include "flat_flowgraph.h" #include <gnuradio/api.h> #include <gnuradio/block.h> -#include <boost/utility.hpp> +#include <boost/core/noncopyable.hpp> namespace gr { diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/high_res_timer_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/high_res_timer_python.cc index 4e581bfc98..387a9b9d53 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/high_res_timer_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/high_res_timer_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(high_res_timer.h) */ -/* BINDTOOL_HEADER_FILE_HASH(07d128321042e69a0ce418de407ceaf4) */ +/* BINDTOOL_HEADER_FILE_HASH(65bfb20df6b18709a817ce85f90e9e06) */ /***********************************************************************************/ #include <pybind11/complex.h> |