diff options
| author | Thomas Habets <thomas@habets.se> | 2020-03-22 14:55:14 +0000 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-03-27 08:45:52 -0700 |
| commit | 5a9f864c9befdee426da6ddaec6e96c63e571bc3 (patch) | |
| tree | e1529ddef962be3843eefb94d8619b79a79c8aca /gr-blocks/lib | |
| parent | 414a495d639ffb817dd3c04d771719e938f50daf (diff) | |
Replace BOOST_FOREACH with C++11 range for
Diffstat (limited to 'gr-blocks/lib')
| -rw-r--r-- | gr-blocks/lib/patterned_interleaver_impl.cc | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/patterned_interleaver_impl.h | 4 | ||||
| -rw-r--r-- | gr-blocks/lib/stream_mux_impl.cc | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc index 9ea596dc67..e38ba5099a 100644 --- a/gr-blocks/lib/patterned_interleaver_impl.cc +++ b/gr-blocks/lib/patterned_interleaver_impl.cc @@ -34,7 +34,7 @@ patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, d_counts(pattern_max(pattern) + 1, 0), d_itemsize(itemsize) { - BOOST_FOREACH (int i, d_pattern) { + for (const auto& i : d_pattern) { d_counts[i]++; } set_output_multiple(d_pattern.size()); diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h index aeeff66179..f48af2cdd5 100644 --- a/gr-blocks/lib/patterned_interleaver_impl.h +++ b/gr-blocks/lib/patterned_interleaver_impl.h @@ -12,7 +12,7 @@ #define INCLUDED_PATTERNED_INTERLEAVER_IMPL_H #include <gnuradio/blocks/patterned_interleaver.h> -#include <boost/foreach.hpp> +#include <algorithm> namespace gr { namespace blocks { @@ -30,7 +30,7 @@ public: int pattern_max(std::vector<int> pattern) { int mval(0); - BOOST_FOREACH (int i, pattern) { + for (const auto& i : pattern) { mval = std::max(mval, i); } return mval; diff --git a/gr-blocks/lib/stream_mux_impl.cc b/gr-blocks/lib/stream_mux_impl.cc index eb4daf9f94..42a0b1f27e 100644 --- a/gr-blocks/lib/stream_mux_impl.cc +++ b/gr-blocks/lib/stream_mux_impl.cc @@ -14,7 +14,6 @@ #include "stream_mux_impl.h" #include <gnuradio/io_signature.h> -#include <boost/foreach.hpp> #include <cstring> namespace gr { @@ -80,7 +79,7 @@ int stream_mux_impl::general_work(int noutput_items, d_stream, input_index[d_stream], input_index[d_stream] + items_to_copy); - BOOST_FOREACH (gr::tag_t t, stream_t) { + for (auto t : stream_t) { t.offset = t.offset - nitems_read(d_stream) - input_index[d_stream] + nitems_written(0) + out_index; add_item_tag(0, t); |