diff options
| author | Andrej Rode <mail@andrejro.de> | 2018-02-17 23:24:10 +0100 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2018-02-17 23:24:10 +0100 |
| commit | 886ce0f13b4135c1206c26786e06a524e92fc271 (patch) | |
| tree | fdf89824d4a5925c44f9b30d1e8d44b713c46b19 /gr-analog/lib/pll_carriertracking_cc_impl.cc | |
| parent | 201031790ec8c855ec2eaf7883652ad37b164208 (diff) | |
math: replace M_PI and derivatives with GR_M_PI defines
Diffstat (limited to 'gr-analog/lib/pll_carriertracking_cc_impl.cc')
| -rw-r--r-- | gr-analog/lib/pll_carriertracking_cc_impl.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc index 0cc3f8b8ec..bf8b219189 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.cc +++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2010-2013 Free Software Foundation, Inc. + * Copyright 2006,2010-2013,2018 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -27,16 +27,13 @@ #include "pll_carriertracking_cc_impl.h" #include <gnuradio/io_signature.h> #include <gnuradio/sincos.h> -#include <math.h> #include <gnuradio/math.h> +#include <cmath> + namespace gr { namespace analog { -#ifndef M_TWOPI -#define M_TWOPI (2.0f*M_PI) -#endif - pll_carriertracking_cc::sptr pll_carriertracking_cc::make(float loop_bw, float max_freq, float min_freq) { @@ -62,10 +59,10 @@ namespace gr { float pll_carriertracking_cc_impl::mod_2pi(float in) { - if(in>M_PI) - return in-M_TWOPI; - else if(in<-M_PI) - return in+M_TWOPI; + if(in>GR_M_PI) + return in-GR_M_TWOPI; + else if(in<-GR_M_PI) + return in+GR_M_TWOPI; else return in; } |