diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2010-11-21 18:24:02 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2010-11-21 18:24:02 -0500 |
| commit | a9777449322e6784f4e67c47d8300cef8d87dbc6 (patch) | |
| tree | b79e82a53aad1c866a2806166a5b22d5d1e2c10b | |
| parent | be71cffac7e1a90a1fdccdeab8bcf3697fd9ca9c (diff) | |
| parent | d74eacddbb8875479fef1d9ca75f36fca78df792 (diff) | |
Merge branch 'next' into tagging
| -rw-r--r-- | docs/doxygen/Doxyfile.in | 6 | ||||
| -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 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 12 | ||||
| -rw-r--r-- | usrp/host/include/usrp/usrp_basic.h | 2 |
8 files changed, 29 insertions, 7 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index 243fa00bfd..f12dd61b76 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -587,7 +587,7 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/docs/doxygen/xml-swig \ @abs_top_builddir@/docs/doxygen/other/doxypy.py \ @abs_top_builddir@/dtools \ - @abs_top_builddir@/gcell/ibm \ + @abs_top_srcdir@/gcell/ibm \ @abs_top_builddir@/gnuradio-core/src/lib/bug_work_around_6.cc \ @abs_top_builddir@/gnuradio-core/src/lib/filter/assembly.h \ @abs_top_builddir@/gnuradio-core/src/lib/filter/generate_all.py \ @@ -666,7 +666,9 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/usrp/host/misc \ @abs_top_builddir@/usrp/host/swig \ @abs_top_builddir@/usrp2/firmware \ - @abs_top_builddir@/usrp2/fpga + @abs_top_srcdir@/usrp2/firmware \ + @abs_top_builddir@/usrp2/fpga \ + @abs_top_srcdir@/usrp2/fpga # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index b4b1abfc67..eb2ba4a17e 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 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: /*! diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index d332bb6171..3c67733742 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -68,6 +68,7 @@ namespace std { // used types //////////////////////////////////////////////////////////////////////// %include <uhd/config.hpp> +%include <uhd/utils/pimpl.hpp> %include <uhd/types/ranges.hpp> %include <uhd/types/tune_request.hpp> %include <uhd/types/tune_result.hpp> @@ -75,6 +76,17 @@ namespace std { %include <uhd/types/time_spec.hpp> %include <uhd/types/clock_config.hpp> +//Re-create range typedefs here with %template as they are not imported. +//Replicate all the levels of templated inheritance so swig understands. + +%template(float_range_t) uhd::range_t<float>; +%template(_float_range_vector_t) std::vector<uhd::range_t<float> >; +%template(gain_range_t) uhd::meta_range_t<float>; + +%template(double_range_t) uhd::range_t<double>; +%template(_double_range_vector_t) std::vector<uhd::range_t<double> >; +%template(freq_range_t) uhd::meta_range_t<double>; + //////////////////////////////////////////////////////////////////////// // block magic //////////////////////////////////////////////////////////////////////// diff --git a/usrp/host/include/usrp/usrp_basic.h b/usrp/host/include/usrp/usrp_basic.h index c24630eb6f..b76493ea4e 100644 --- a/usrp/host/include/usrp/usrp_basic.h +++ b/usrp/host/include/usrp/usrp_basic.h @@ -88,7 +88,7 @@ protected: */ std::vector< std::vector<db_base_sptr> > d_db; - //! One time call, made only only from usrp_standard_*::make after shared_ptr is created. + // One time call, made only only from usrp_standard_*::make after shared_ptr is created. void init_db(usrp_basic_sptr u); |