diff options
| author | lazydodo <github@lazydodo.com> | 2015-05-11 10:27:21 -0600 |
|---|---|---|
| committer | lazydodo <github@lazydodo.com> | 2015-05-11 10:27:21 -0600 |
| commit | ebd97e5eb541b58f76bbbe8be877c55517fe6b6f (patch) | |
| tree | 6d0fa2d19e502aeb2453f9f7bdd4040d6f05f44e | |
| parent | fa247a9f587651dedfa74ac2b56dc9c3e86a171e (diff) | |
remove and/or/xor keywords.
| -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 | ||||
| -rw-r--r-- | gr-fec/lib/gf2mat.cc | 4 | ||||
| -rw-r--r-- | gr-qtgui/lib/vector_sink_f_impl.cc | 4 |
5 files changed, 7 insertions, 7 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]); } } diff --git a/gr-fec/lib/gf2mat.cc b/gr-fec/lib/gf2mat.cc index 87cb300890..accc2859f2 100644 --- a/gr-fec/lib/gf2mat.cc +++ b/gr-fec/lib/gf2mat.cc @@ -109,13 +109,13 @@ GF2Vec GF2Mat::get_col(int i) { void GF2Mat::add_cols(int i, int j) { for ( int row = 0; row < M; row++ ) { - H[row][i] = H[row][i] xor H[row][j]; + H[row][i] = H[row][i] ^ H[row][j]; } } void GF2Mat::add_rows(int i, int j) { for ( int col = 0; col < N; col++ ) { - H[i][col] = H[i][col] xor H[j][col]; + H[i][col] = H[i][col] ^ H[j][col]; } } diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc index 0644071ebc..ba139b97f4 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -157,7 +157,7 @@ namespace gr { d_main_gui->setVecSize(d_vlen); set_x_axis(x_start, x_step); - if(not name.empty()) + if(! name.empty()) set_title(name); set_x_axis_label(x_axis_label); set_y_axis_label(y_axis_label); @@ -203,7 +203,7 @@ namespace gr { void vector_sink_f_impl::set_vec_average(const float avg) { - if (avg < 0 or avg > 1.0) { + if (avg < 0 || avg > 1.0) { GR_LOG_ALERT(d_logger, "Invalid average value received in set_vec_average(), must be within [0, 1]."); return; } |