diff options
| author | Josh Blum | 2010-11-22 20:19:55 -0800 |
|---|---|---|
| committer | Josh Blum | 2010-11-22 20:19:55 -0800 |
| commit | d81a16ddca6e81b1278560b71f8064bd6e583e55 (patch) | |
| tree | cdebaf283b829c7da6d49c810131cb2d4e678c32 /gr-uhd/lib | |
| parent | d74eacddbb8875479fef1d9ca75f36fca78df792 (diff) | |
| download | gnuradio-d81a16ddca6e81b1278560b71f8064bd6e583e55.tar.gz gnuradio-d81a16ddca6e81b1278560b71f8064bd6e583e55.tar.bz2 gnuradio-d81a16ddca6e81b1278560b71f8064bd6e583e55.zip | |
uhd: remove changes to avoid merge conflict
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, 4 insertions, 12 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index eb2ba4a17..b4b1abfc6 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -53,12 +53,4 @@ 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 29e9298a9..28a530b60 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 36735ae7e..dc2927598 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 930487049..b239e3f21 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 d9f8d252a..c524a024a 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: /*! |