diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-10-06 12:25:31 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-10-06 12:25:31 -0400 |
| commit | 797b5924d310fe6d5fdcce176b6fb3d89618b7b5 (patch) | |
| tree | 6b1277d4d2bfdd4abff01ff8c012a7d7dfad0bdb /gr-uhd/lib/usrp_source_impl.cc | |
| parent | 4f03a54b2b802f0eff6802985ec6479738843c57 (diff) | |
| parent | 41fbbc6a54fc7c3d9a9d73697f412bca234061bb (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-uhd/lib/usrp_source_impl.cc')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index a71f53c5b3..3142627952 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -710,7 +710,7 @@ namespace gr { if (command == "freq") { double freq = pmt::to_double(cmd_value); for (size_t i = 0; i < _nchan; i++) { - if (chan == -1 or chan == int(i)) { + if (chan == -1 || chan == int(i)) { set_center_freq(freq, i); } } @@ -720,7 +720,7 @@ namespace gr { } else if (command == "gain") { double gain = pmt::to_double(cmd_value); for (size_t i = 0; i < _nchan; i++) { - if (chan == -1 or chan == int(i)) { + if (chan == -1 || chan == int(i)) { set_gain(gain, i); } } |