diff options
Diffstat (limited to 'gr-digital/lib')
| -rw-r--r-- | gr-digital/lib/corr_est_cc_impl.cc | 2 | ||||
| -rw-r--r-- | gr-digital/lib/msk_timing_recovery_cc_impl.cc | 2 | ||||
| -rw-r--r-- | gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gr-digital/lib/corr_est_cc_impl.cc b/gr-digital/lib/corr_est_cc_impl.cc index ac753fbba5..66645f6b5d 100644 --- a/gr-digital/lib/corr_est_cc_impl.cc +++ b/gr-digital/lib/corr_est_cc_impl.cc @@ -266,7 +266,7 @@ namespace gr { // holds the +/- fraction of a sample index from the found // peak index to the estimated actual peak index. double center = 0.0; - if (i > 0 and i < (noutput_items - 1)) { + if (i > 0 && i < (noutput_items - 1)) { double nom = 0, den = 0; for(int s = 0; s < 3; s++) { nom += (s+1)*d_corr_mag[i+s-1]; diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.cc b/gr-digital/lib/msk_timing_recovery_cc_impl.cc index a567357019..4b26573870 100644 --- a/gr-digital/lib/msk_timing_recovery_cc_impl.cc +++ b/gr-digital/lib/msk_timing_recovery_cc_impl.cc @@ -183,7 +183,7 @@ out: d_mu += d_gain*err_out; } //output every other d_sps by default. - if(!(d_div % 2) or d_osps==2) { + if(!(d_div % 2) || d_osps==2) { out[oidx] = in_interp; if(output_items.size() >= 2) out2[oidx] = err_out; if(output_items.size() >= 3) out3[oidx] = d_mu; diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc index 70e840d778..1b0dee4055 100644 --- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc +++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc @@ -167,7 +167,7 @@ namespace gr { get_tags_in_window(tags, 0, 0, frame_len); for (size_t i = 0; i < tags.size(); i++) { if (tags[i].key != CHAN_TAPS_KEY - and tags[i].key != pmt::mp(d_length_tag_key_str)) { + && tags[i].key != pmt::mp(d_length_tag_key_str)) { add_item_tag(0, tags[i]); } } |