diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-10-06 12:25:49 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-10-06 12:25:49 -0400 |
| commit | d77dc4a00dbe71f9987ea94b1a042cb6d3ee5079 (patch) | |
| tree | df1d51fb941cd7827cee44a90eed2c8307fc2b91 /gr-uhd/lib/usrp_source_impl.cc | |
| parent | ebc478a5c0770e7397f2a34126541130e0748e71 (diff) | |
| parent | 797b5924d310fe6d5fdcce176b6fb3d89618b7b5 (diff) | |
Merge branch 'master' into next
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 3ed204c6ac..780714a910 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); } } |