diff options
| -rw-r--r-- | gr-atsc/src/lib/atsc_bit_timing_loop.cc | 2 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_field_sync_demux.cc | 6 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_viterbi_decoder.cc | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc index 7c12fc111..07cc4b8f5 100644 --- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/src/lib/atsc_bit_timing_loop.cc @@ -56,7 +56,7 @@ atsc_bit_timing_loop::forecast (int noutput_items, gr_vector_int &ninput_items_r { unsigned ninputs = ninput_items_required.size(); for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = noutput_items * d_rx_clock_to_symbol_freq + 1500 - 1; + ninput_items_required[i] = static_cast<int>(noutput_items * d_rx_clock_to_symbol_freq) + 1500 - 1; } diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.cc b/gr-atsc/src/lib/atsc_field_sync_demux.cc index 070c901ad..c5712a25d 100644 --- a/gr-atsc/src/lib/atsc_field_sync_demux.cc +++ b/gr-atsc/src/lib/atsc_field_sync_demux.cc @@ -32,9 +32,11 @@ #include <atsci_syminfo.h> #include <stdio.h> #include <assert.h> -#include <iostream.h> +#include <iostream> + +using std::cerr; +using std::endl; -using std::abs; static const int DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation factor diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.cc b/gr-atsc/src/lib/atsc_viterbi_decoder.cc index 180e03533..862a8ea79 100644 --- a/gr-atsc/src/lib/atsc_viterbi_decoder.cc +++ b/gr-atsc/src/lib/atsc_viterbi_decoder.cc @@ -27,8 +27,10 @@ #include <atsc_viterbi_decoder.h> #include <gr_io_signature.h> #include <atsc_consts.h> -#include <iostream.h> +#include <iostream> +using std::cerr; +using std::endl; atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder() |