diff options
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/logger.h | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/flowgraph.cc | 5 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/hier_block2_detail.cc | 5 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/logger.cc | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/rpcregisterhelpers_python.cc | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/qa_block_tags.cc | 2 | ||||
| -rw-r--r-- | gr-fec/lib/polar_decoder_common.cc | 2 |
9 files changed, 15 insertions, 6 deletions
diff --git a/gnuradio-runtime/include/gnuradio/logger.h b/gnuradio-runtime/include/gnuradio/logger.h index 4c7555f89b..17a3e22fbc 100644 --- a/gnuradio-runtime/include/gnuradio/logger.h +++ b/gnuradio-runtime/include/gnuradio/logger.h @@ -36,7 +36,6 @@ typedef int mode_t; #include <cassert> #include <ctime> #include <filesystem> -#include <iostream> #include <memory> namespace gr { diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h index 2e7341c608..0277376210 100644 --- a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h +++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h @@ -16,7 +16,6 @@ #include <gnuradio/rpcserver_booter_base.h> #include <gnuradio/rpcserver_selector.h> #include <cstdio> -#include <iostream> #include <sstream> // Fixes circular dependency issue before including block_registry.h diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc index 5c65758888..4e60e16010 100644 --- a/gnuradio-runtime/lib/flowgraph.cc +++ b/gnuradio-runtime/lib/flowgraph.cc @@ -17,9 +17,12 @@ #include <sstream> #include <stdexcept> +// TODO: Replace with GNU Radio logging +#include <iostream> + namespace gr { -#define FLOWGRAPH_DEBUG 0 +constexpr bool FLOWGRAPH_DEBUG = false; edge::~edge() {} diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index 512cfaa33e..d63195d36d 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -19,9 +19,12 @@ #include <sstream> #include <stdexcept> +// TODO: Replace with GNU Radio logging +#include <iostream> + namespace gr { -#define HIER_BLOCK2_DETAIL_DEBUG 0 +constexpr bool HIER_BLOCK2_DETAIL_DEBUG = false; hier_block2_detail::hier_block2_detail(hier_block2* owner) : d_owner(owner), d_parent_detail(0), d_fg(make_flowgraph()) diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc index c344f050be..ee3bc28e71 100644 --- a/gnuradio-runtime/lib/logger.cc +++ b/gnuradio-runtime/lib/logger.cc @@ -21,6 +21,7 @@ #include <gnuradio/logger.h> #include <gnuradio/prefs.h> #include <algorithm> +#include <iostream> #include <memory> #include <stdexcept> diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc index 1c5263a5bc..38a3ea69a3 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(logger.h) */ -/* BINDTOOL_HEADER_FILE_HASH(2a6f012c037ce0d331d09bcf2c3d600a) */ +/* BINDTOOL_HEADER_FILE_HASH(56f115dfac11fe07dee83b93e80941a3) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/rpcregisterhelpers_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/rpcregisterhelpers_python.cc index 3b554aa643..8c74a9910c 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/rpcregisterhelpers_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/rpcregisterhelpers_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(rpcregisterhelpers.h) */ -/* BINDTOOL_HEADER_FILE_HASH(824d93e3a111258aafa88e46b1eb4e4b) */ +/* BINDTOOL_HEADER_FILE_HASH(28fa0d90b96f4fdf9fe7c0bb42769930) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-blocks/lib/qa_block_tags.cc b/gr-blocks/lib/qa_block_tags.cc index c05c7ee2ce..091eb3c65c 100644 --- a/gr-blocks/lib/qa_block_tags.cc +++ b/gr-blocks/lib/qa_block_tags.cc @@ -22,6 +22,8 @@ #include <gnuradio/top_block.h> #include <boost/test/unit_test.hpp> +// FIXME use logging +#include <iostream> // ---------------------------------------------------------------- diff --git a/gr-fec/lib/polar_decoder_common.cc b/gr-fec/lib/polar_decoder_common.cc index 392451737e..5fe5fc4033 100644 --- a/gr-fec/lib/polar_decoder_common.cc +++ b/gr-fec/lib/polar_decoder_common.cc @@ -17,6 +17,7 @@ #include <volk/volk.h> #include <cstdio> +#include <iostream> namespace gr { namespace fec { @@ -166,6 +167,7 @@ void polar_decoder_common::extract_info_bits(unsigned char* output, void polar_decoder_common::print_pretty_llr_vector(const float* llr_vec) const { for (int row = 0; row < block_size(); row++) { + // FIXME this is an interesting mixture of iostream and stdio std::cout << row << "->" << int(bit_reverse(row, block_power())) << ":\t"; for (int stage = 0; stage < block_power() + 1; stage++) { printf("%+4.2f, ", llr_vec[(stage * block_size()) + row]); |