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 /gr-digital/lib/corr_est_cc_impl.cc | |
| parent | fa247a9f587651dedfa74ac2b56dc9c3e86a171e (diff) | |
remove and/or/xor keywords.
Diffstat (limited to 'gr-digital/lib/corr_est_cc_impl.cc')
| -rw-r--r-- | gr-digital/lib/corr_est_cc_impl.cc | 2 |
1 files changed, 1 insertions, 1 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]; |