diff options
| author | Eric Blossom | 2010-11-18 23:45:14 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-11-18 23:45:14 -0800 |
| commit | 3d3f38a1da8440b8f8f6d65dbf89b46ebfa48fd3 (patch) | |
| tree | 0a0bb1a1c7355ecc892d1e34e63f2ef45ff79ace | |
| parent | 6237fafa53938db53a3e2a82b79e80b524dd05db (diff) | |
| parent | d74eacddbb8875479fef1d9ca75f36fca78df792 (diff) | |
| download | gnuradio-3d3f38a1da8440b8f8f6d65dbf89b46ebfa48fd3.tar.gz gnuradio-3d3f38a1da8440b8f8f6d65dbf89b46ebfa48fd3.tar.bz2 gnuradio-3d3f38a1da8440b8f8f6d65dbf89b46ebfa48fd3.zip | |
Merge remote branch 'gnuradio.org/next' into works
* gnuradio.org/next:
Remove 868 useless warnings about "is deprecated".
| -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 |
4 files changed, 4 insertions, 4 deletions
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: /*! |