diff options
| author | Tom Rondeau | 2011-07-12 23:02:47 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-07-12 23:06:08 -0400 |
| commit | 0b3d5b1a3238d9f72bcdef6aa3131776fb572175 (patch) | |
| tree | c7bc86c8097ebf8371a17d83002844feffd866bd /gr-digital/lib | |
| parent | 54a1ae3aeea9709e436bb2fc69ae47aeffd1cb29 (diff) | |
| download | gnuradio-0b3d5b1a3238d9f72bcdef6aa3131776fb572175.tar.gz gnuradio-0b3d5b1a3238d9f72bcdef6aa3131776fb572175.tar.bz2 gnuradio-0b3d5b1a3238d9f72bcdef6aa3131776fb572175.zip | |
fixing build for constellation code. Had to make some changes to the qa code to import the right stuff after being changed from sitting in gnuradio-core.
Diffstat (limited to 'gr-digital/lib')
| -rw-r--r-- | gr-digital/lib/Makefile.am | 7 | ||||
| -rw-r--r-- | gr-digital/lib/digital_constellation_decoder_cb.cc | 2 | ||||
| -rw-r--r-- | gr-digital/lib/digital_constellation_decoder_cb.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index 560d242ad..4f67614d8 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -38,13 +38,12 @@ lib_LTLIBRARIES = libgnuradio-digital.la libgnuradio_digital_la_SOURCES = \ digital_constellation.cc \ - digital_constellation_receiver_cb.h \ - digital_constellation_decoder_cb.h \ + digital_constellation_receiver_cb.cc \ + digital_constellation_decoder_cb.cc \ digital_costas_loop_cc.cc \ digital_cma_equalizer_cc.cc \ digital_lms_dd_equalizer_cc.cc \ - digital_kurtotic_equalizer_cc.cc \ - digital_constellation_receiver_cb.h + digital_kurtotic_equalizer_cc.cc libgnuradio_digital_la_LIBADD = \ $(GNURADIO_CORE_LA) diff --git a/gr-digital/lib/digital_constellation_decoder_cb.cc b/gr-digital/lib/digital_constellation_decoder_cb.cc index 8ac34f1d6..4638790f6 100644 --- a/gr-digital/lib/digital_constellation_decoder_cb.cc +++ b/gr-digital/lib/digital_constellation_decoder_cb.cc @@ -32,7 +32,7 @@ digital_constellation_decoder_cb_sptr digital_make_constellation_decoder_cb (digital_constellation_sptr constellation) { - return digital_constellation_decoder_cb_sptr + return gnuradio::get_initial_sptr (new digital_constellation_decoder_cb(constellation)); } diff --git a/gr-digital/lib/digital_constellation_decoder_cb.h b/gr-digital/lib/digital_constellation_decoder_cb.h index 420ae5c74..022456733 100644 --- a/gr-digital/lib/digital_constellation_decoder_cb.h +++ b/gr-digital/lib/digital_constellation_decoder_cb.h @@ -46,7 +46,7 @@ class digital_constellation_decoder_cb : public gr_block unsigned int d_dim; friend digital_constellation_decoder_cb_sptr - gr_make_constellation_decoder_cb (digital_constellation_sptr constellation); + digital_make_constellation_decoder_cb (digital_constellation_sptr constellation); digital_constellation_decoder_cb (digital_constellation_sptr constellation); |