diff options
| author | Tom Rondeau | 2010-11-02 12:53:15 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-02 12:53:15 -0400 |
| commit | 1fa9a8ea31115b878bff48d2259fc72d1a37b52c (patch) | |
| tree | 96caa22ac6688d2533721ee87d14efe04d03aff8 /gnuradio-core | |
| parent | 1d63a52520ebdac7242784eafa79093b7fc2710d (diff) | |
| download | gnuradio-1fa9a8ea31115b878bff48d2259fc72d1a37b52c.tar.gz gnuradio-1fa9a8ea31115b878bff48d2259fc72d1a37b52c.tar.bz2 gnuradio-1fa9a8ea31115b878bff48d2259fc72d1a37b52c.zip | |
Sneaking in a few warning fixes to this branch.
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc index cb67b8104..db16a634b 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc +++ b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.cc @@ -55,7 +55,6 @@ gr_pfb_channelizer_ccf::gr_pfb_channelizer_ccf (unsigned int numchans, // This tests the specified input sample rate to see if it conforms to this // requirement within a few significant figures. double intp = 0; - double x = (10000.0*rint(numchans / oversample_rate)) / 10000.0; double fltp = modf(numchans / oversample_rate, &intp); if(fltp != 0.0) throw std::invalid_argument("gr_pfb_channelizer: oversample rate must be N/i for i in [1, N]"); diff --git a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc b/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc index ff997e7a9..c32398e6d 100644 --- a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc +++ b/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc @@ -161,8 +161,9 @@ gr_fll_band_edge_cc::work (int noutput_items, const gr_complex *in = (const gr_complex *) input_items[0]; gr_complex *out = (gr_complex *) output_items[0]; - float *frq, *phs; - gr_complex *err; + float *frq = NULL; + float *phs = NULL; + gr_complex *err = NULL; if(output_items.size() > 2) { frq = (float *) output_items[1]; phs = (float *) output_items[2]; |