diff options
| author | Eric Blossom | 2010-11-17 19:00:12 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-11-17 19:00:12 -0800 |
| commit | 9edc59fc7cff2321c87042733c0bf29115fb34ee (patch) | |
| tree | d9da7a61eef67c6d9a67cbd3a0d94c850fba76bc /gr-uhd | |
| parent | 6129a67cf6527a0f0dc8b83df108c4fe2147155b (diff) | |
| parent | 3f56b10b5eaef36643fd87044601ca47cd9fb707 (diff) | |
| download | gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.tar.gz gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.tar.bz2 gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.zip | |
Merge remote branch 'gnuradio.org/next' into test
* gnuradio.org/next:
distcheck fix for gr-uhd
Keep doxygen 1.7.1 from crashing.
uhd: swig changes for templated ranges
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/lib/Makefile.am | 8 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 12 |
2 files changed, 20 insertions, 0 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/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index b3abf29be..7344f7a72 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -66,6 +66,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> @@ -73,6 +74,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 //////////////////////////////////////////////////////////////////////// |