diff options
| author | Eric Blossom <eb@comsec.com> | 2010-11-21 19:11:33 -0800 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-11-21 19:11:33 -0800 |
| commit | 6f6a9f3f2f089c94e58a4202ee5ff2c47d1baf1f (patch) | |
| tree | b671e7ca06ae10397a84001b92709b86870b7da3 /gr-uhd | |
| parent | d4ed4d96470c91bcb7fb45da5e07641b24331cba (diff) | |
| parent | ff62557a42b6ce89a711f9d0603c0fe52a891ed8 (diff) | |
Merge branch 'works' into broken
* works:
Make Guile bindings work with --with-gnuradio-core et al.
Update TODO
Add guile SIGINT handler to gr:wait.
Minor tweaks: comments, static
Add guile shim to gr_top_block::wait that exits guile mode before blocking.
Enable more tests
Enable a couple more tests
Remove 868 useless warnings about "is deprecated".
gr_msg_queue now working correctly from within guile.
Disable items that require swig directors when building guile bindings.
Diffstat (limited to 'gr-uhd')
| -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 28a530b603..29e9298a98 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 dc29275985..36735ae7e8 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 b239e3f212..930487049e 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 c524a024a8..d9f8d252a3 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: /*! |