diff options
Diffstat (limited to 'gr-fft')
-rw-r--r-- | gr-fft/include/gnuradio/fft/window.h | 4 | ||||
-rw-r--r-- | gr-fft/lib/ctrlport_probe_psd_impl.h | 2 | ||||
-rw-r--r-- | gr-fft/lib/fft.cc | 6 | ||||
-rw-r--r-- | gr-fft/lib/fft_vcc_fftw.h | 2 | ||||
-rw-r--r-- | gr-fft/lib/fft_vfc_fftw.h | 2 | ||||
-rw-r--r-- | gr-fft/lib/goertzel_fc_impl.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/gr-fft/include/gnuradio/fft/window.h b/gr-fft/include/gnuradio/fft/window.h index d6ccf9ff7c..6173b9f975 100644 --- a/gr-fft/include/gnuradio/fft/window.h +++ b/gr-fft/include/gnuradio/fft/window.h @@ -24,9 +24,9 @@ #define INCLUDED_FFT_WINDOW_H #include <gnuradio/fft/api.h> -#include <vector> -#include <cmath> #include <gnuradio/gr_complex.h> +#include <cmath> +#include <vector> namespace gr { namespace fft { diff --git a/gr-fft/lib/ctrlport_probe_psd_impl.h b/gr-fft/lib/ctrlport_probe_psd_impl.h index 58b1f10414..4b1e2ad98f 100644 --- a/gr-fft/lib/ctrlport_probe_psd_impl.h +++ b/gr-fft/lib/ctrlport_probe_psd_impl.h @@ -24,9 +24,9 @@ #define INCLUDED_CTRLPORT_PROBE_PSD_IMPL_H #include <gnuradio/fft/ctrlport_probe_psd.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/rpcregisterhelpers.h> #include <boost/thread/shared_mutex.hpp> -#include <gnuradio/fft/fft.h> namespace gr { namespace fft { diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc index 68070d2399..bc73e31b2f 100644 --- a/gr-fft/lib/fft.cc +++ b/gr-fft/lib/fft.cc @@ -21,10 +21,10 @@ */ #include <gnuradio/fft/fft.h> -#include <gnuradio/sys_paths.h> #include <gnuradio/gr_complex.h> -#include <volk/volk.h> +#include <gnuradio/sys_paths.h> #include <fftw3.h> +#include <volk/volk.h> #ifdef _WIN32 // http://www.fftw.org/install/windows.html#DLLwisdom static void my_fftw_write_char(char c, void* f) { fputc(c, (FILE*)f); } @@ -44,9 +44,9 @@ static int my_fftw_read_char(void* f) { return fgetc((FILE*)f); } #define O_NONBLOCK 0 #endif //_WIN32 +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> #include <cassert> #include <stdexcept> diff --git a/gr-fft/lib/fft_vcc_fftw.h b/gr-fft/lib/fft_vcc_fftw.h index 45afdd024f..631e41d9ca 100644 --- a/gr-fft/lib/fft_vcc_fftw.h +++ b/gr-fft/lib/fft_vcc_fftw.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H #define INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H -#include <gnuradio/fft/fft_vcc.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/fft/fft_vcc.h> namespace gr { namespace fft { diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h index 4b0e905643..47c1ca529c 100644 --- a/gr-fft/lib/fft_vfc_fftw.h +++ b/gr-fft/lib/fft_vfc_fftw.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H #define INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H -#include <gnuradio/fft/fft_vfc.h> #include <gnuradio/fft/fft.h> +#include <gnuradio/fft/fft_vfc.h> namespace gr { namespace fft { diff --git a/gr-fft/lib/goertzel_fc_impl.h b/gr-fft/lib/goertzel_fc_impl.h index 607e7e1f95..c84512b586 100644 --- a/gr-fft/lib/goertzel_fc_impl.h +++ b/gr-fft/lib/goertzel_fc_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_GOERTZEL_FC_IMPL_H #define INCLUDED_FFT_GOERTZEL_FC_IMPL_H -#include <gnuradio/fft/goertzel_fc.h> #include <gnuradio/fft/goertzel.h> +#include <gnuradio/fft/goertzel_fc.h> namespace gr { namespace fft { |