diff options
| author | Tom Rondeau | 2010-11-21 18:24:02 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-21 18:24:02 -0500 |
| commit | a9777449322e6784f4e67c47d8300cef8d87dbc6 (patch) | |
| tree | b79e82a53aad1c866a2806166a5b22d5d1e2c10b /gr-uhd/lib | |
| parent | be71cffac7e1a90a1fdccdeab8bcf3697fd9ca9c (diff) | |
| parent | d74eacddbb8875479fef1d9ca75f36fca78df792 (diff) | |
| download | gnuradio-a9777449322e6784f4e67c47d8300cef8d87dbc6.tar.gz gnuradio-a9777449322e6784f4e67c47d8300cef8d87dbc6.tar.bz2 gnuradio-a9777449322e6784f4e67c47d8300cef8d87dbc6.zip | |
Merge branch 'next' into tagging
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/Makefile.am | 8 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_mimo_sink.h | 2 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_mimo_source.h | 2 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_simple_sink.h | 2 | ||||
| -rw-r--r-- | gr-uhd/lib/uhd_simple_source.h | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index b4b1abfc6..eb2ba4a17 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -53,4 +53,12 @@ grinclude_HEADERS = \ uhd_single_usrp_source.h \ uhd_single_usrp_sink.h +# add the deprecated headers +grinclude_HEADERS += \ + uhd_mimo_source.h \ + uhd_mimo_sink.h \ + uhd_simple_source.h \ + uhd_simple_sink.h + + noinst_HEADERS = diff --git a/gr-uhd/lib/uhd_mimo_sink.h b/gr-uhd/lib/uhd_mimo_sink.h index 28a530b60..29e9298a9 100644 --- a/gr-uhd/lib/uhd_mimo_sink.h +++ b/gr-uhd/lib/uhd_mimo_sink.h @@ -37,7 +37,7 @@ boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink( /*********************************************************************** * DEPRECATED **********************************************************************/ -class UHD_DEPRECATED uhd_mimo_sink : public gr_sync_block{ +class /*UHD_DEPRECATED*/ uhd_mimo_sink : public gr_sync_block{ public: /*! diff --git a/gr-uhd/lib/uhd_mimo_source.h b/gr-uhd/lib/uhd_mimo_source.h index dc2927598..36735ae7e 100644 --- a/gr-uhd/lib/uhd_mimo_source.h +++ b/gr-uhd/lib/uhd_mimo_source.h @@ -37,7 +37,7 @@ boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source( /*********************************************************************** * DEPRECATED **********************************************************************/ -class UHD_DEPRECATED uhd_mimo_source : public gr_sync_block{ +class /*UHD_DEPRECATED*/ uhd_mimo_source : public gr_sync_block{ public: /*! diff --git a/gr-uhd/lib/uhd_simple_sink.h b/gr-uhd/lib/uhd_simple_sink.h index b239e3f21..930487049 100644 --- a/gr-uhd/lib/uhd_simple_sink.h +++ b/gr-uhd/lib/uhd_simple_sink.h @@ -36,7 +36,7 @@ boost::shared_ptr<uhd_simple_sink> uhd_make_simple_sink( /*********************************************************************** * DEPRECATED **********************************************************************/ -class UHD_DEPRECATED uhd_simple_sink : public gr_sync_block{ +class /*UHD_DEPRECATED*/ uhd_simple_sink : public gr_sync_block{ public: /*! diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h index c524a024a..d9f8d252a 100644 --- a/gr-uhd/lib/uhd_simple_source.h +++ b/gr-uhd/lib/uhd_simple_source.h @@ -36,7 +36,7 @@ boost::shared_ptr<uhd_simple_source> uhd_make_simple_source( /*********************************************************************** * DEPRECATED **********************************************************************/ -class UHD_DEPRECATED uhd_simple_source : public gr_sync_block{ +class /*UHD_DEPRECATED*/ uhd_simple_source : public gr_sync_block{ public: /*! |