diff options
| author | Nick Foster | 2011-01-21 11:20:08 -0800 |
|---|---|---|
| committer | Nick Foster | 2011-01-21 11:25:15 -0800 |
| commit | b6850bbdaeab5ce85d2414cfa9c8344fb6f91883 (patch) | |
| tree | a734ff207bf91945bc7157dba35829a11a7653a8 /gr-uhd/swig/uhd_swig.i | |
| parent | e3600f59e76c3dc08aedfd77629b7c5c48df86af (diff) | |
| parent | d429522b8cc0916c0dd8167284e9f7373f8c1663 (diff) | |
| download | gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.tar.gz gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.tar.bz2 gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into volk_rename
Conflicts:
volk/lib/Makefile.am
Diffstat (limited to 'gr-uhd/swig/uhd_swig.i')
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 76f44a491..3c317beb4 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010 Free Software Foundation, Inc. + * Copyright 2010-2011 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,6 +24,8 @@ // header files if UHD was not installed. #ifdef GR_HAVE_UHD +#define GR_UHD_API + //////////////////////////////////////////////////////////////////////// // Language independent exception handler //////////////////////////////////////////////////////////////////////// @@ -47,10 +49,6 @@ //////////////////////////////////////////////////////////////////////// %include "gnuradio.i" -namespace std { - %template(StringVector) vector<string>; -} - //////////////////////////////////////////////////////////////////////// // block headers //////////////////////////////////////////////////////////////////////// @@ -64,25 +62,36 @@ namespace std { //////////////////////////////////////////////////////////////////////// // used types //////////////////////////////////////////////////////////////////////// +%template(string_vector_t) std::vector<std::string>; + %include <uhd/config.hpp> + %include <uhd/utils/pimpl.hpp> + +%include <uhd/types/dict.hpp> +%template(string_string_dict_t) uhd::dict<std::string, std::string>; //define after dict + +%include <uhd/types/device_addr.hpp> + +%include <uhd/types/io_type.hpp> + +%template(range_vector_t) std::vector<uhd::range_t>; //define before range %include <uhd/types/ranges.hpp> + %include <uhd/types/tune_request.hpp> + %include <uhd/types/tune_result.hpp> + %include <uhd/types/io_type.hpp> + %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. +%include <uhd/types/clock_config.hpp> -%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>; +%include <uhd/types/metadata.hpp> -%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>; +%include <uhd/device.hpp> +%template(device_addr_vector_t) std::vector<uhd::device_addr_t>; //////////////////////////////////////////////////////////////////////// // block magic |