diff options
Diffstat (limited to 'gr-analog/include/gnuradio/analog')
4 files changed, 5 insertions, 5 deletions
diff --git a/gr-analog/include/gnuradio/analog/agc.h b/gr-analog/include/gnuradio/analog/agc.h index 44896250d4..1e9759c454 100644 --- a/gr-analog/include/gnuradio/analog/agc.h +++ b/gr-analog/include/gnuradio/analog/agc.h @@ -25,7 +25,7 @@ #include <gnuradio/analog/api.h> #include <gnuradio/gr_complex.h> -#include <math.h> +#include <cmath> namespace gr { namespace analog { @@ -70,7 +70,7 @@ namespace gr { { gr_complex output = input * _gain; - _gain += _rate * (_reference - sqrt(output.real()*output.real() + + _gain += _rate * (_reference - std::sqrt(output.real()*output.real() + output.imag()*output.imag())); if(_max_gain > 0.0 && _gain > _max_gain) { _gain = _max_gain; diff --git a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index ce4170fff1..dceb3a618f 100644 --- a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -43,7 +43,7 @@ namespace gr { * input and outputs that signal, downconverted to DC * * All settings max_freq and min_freq are in terms of radians per - * sample, NOT HERTZ. The loop bandwidth determins the lock range + * sample, NOT HERTZ. The loop bandwidth determines the lock range * and should be set around pi/200 -- 2pi/100. \sa * pll_freqdet_cf, pll_carriertracking_cc */ diff --git a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index 88eb46edc5..a7bd654c99 100644 --- a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -42,7 +42,7 @@ namespace gr { * This PLL locks onto a [possibly noisy] reference carrier on * the input and outputs an estimate of that frequency in radians per sample. * All settings max_freq and min_freq are in terms of radians per sample, - * NOT HERTZ. The loop bandwidth determins the lock range and should be set + * NOT HERTZ. The loop bandwidth determines the lock range and should be set * around pi/200 -- 2pi/100. * \sa pll_refout_cc, pll_carriertracking_cc */ diff --git a/gr-analog/include/gnuradio/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h index 9f9d168111..c73be94309 100644 --- a/gr-analog/include/gnuradio/analog/pll_refout_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h @@ -43,7 +43,7 @@ namespace gr { * aligned to it. * * All settings max_freq and min_freq are in terms of radians per - * sample, NOT HERTZ. The loop bandwidth determins the lock range + * sample, NOT HERTZ. The loop bandwidth determines the lock range * and should be set around pi/200 -- 2pi/100. \sa * pll_freqdet_cf, pll_carriertracking_cc */ |