diff options
| author | Johnathan Corgan | 2012-04-04 11:47:39 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-04 11:47:39 -0700 |
| commit | 531ffdf2c8d0baebb553d8db323edb0ab67e9099 (patch) | |
| tree | 43cf95dd408e4a58c5816ba1ae9bf7055a4d0a41 /gr-fcd/lib | |
| parent | 6522dd051302a1691a7ce27be78acd81d733fdb2 (diff) | |
| parent | a87ac60f15c2593ececb02ba16ab842c20e760d2 (diff) | |
| download | gnuradio-531ffdf2c8d0baebb553d8db323edb0ab67e9099.tar.gz gnuradio-531ffdf2c8d0baebb553d8db323edb0ab67e9099.tar.bz2 gnuradio-531ffdf2c8d0baebb553d8db323edb0ab67e9099.zip | |
Merge branch 'master' into next
Conflicts:
config/grc_gr_fcd.m4
gr-fcd/swig/Makefile.am
gr-fcd/swig/fcd_swig.i
Diffstat (limited to 'gr-fcd/lib')
| -rw-r--r-- | gr-fcd/lib/fcd_source_c_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc index 9543f16eb..ca370d9f3 100644 --- a/gr-fcd/lib/fcd_source_c_impl.cc +++ b/gr-fcd/lib/fcd_source_c_impl.cc @@ -47,7 +47,7 @@ static const int MIN_OUT = 1; /*!< Minimum number of output streams. */ static const int MAX_OUT = 1; /*!< Maximum number of output streams. */ fcd_source_c_impl::fcd_source_c_impl(const std::string device_name) - : gr_hier_block2 ("fcd_source_c_impl", + : gr_hier_block2 ("fcd_source_c", gr_make_io_signature (MIN_IN, MAX_IN, sizeof (gr_complex)), gr_make_io_signature (MIN_OUT, MAX_OUT, sizeof (gr_complex))), d_freq_corr(-120), |