diff options
| author | Martin Braun <martin.braun@kit.edu> | 2013-03-15 02:12:20 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 02:13:55 -0700 |
| commit | f968b36d4ed2b194111585605f9a1b5367638fb3 (patch) | |
| tree | c5a18a3412aa3a4b2c89ede3a68d08ba7980401f /gnuradio-core/src/lib/swig/gnuradio.i | |
| parent | 86d05c838e2cfeb9a9c73a0e19668a45cc8b333c (diff) | |
Squash/rebased martin/ofdm-master onto trial merge branch
Conflicts:
gr-blocks/include/blocks/CMakeLists.txt
Diffstat (limited to 'gnuradio-core/src/lib/swig/gnuradio.i')
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index 3a421ad5d6..4378e6aad2 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -38,6 +38,7 @@ #include <gr_types.h> #include <stddef.h> // size_t #include <complex> +#include <string.h> %} %feature("autodoc","1"); @@ -48,6 +49,7 @@ %include <std_vector.i> %include <stl.i> %include <std_except.i> +%include <std_string.i> typedef std::complex<float> gr_complex; typedef std::complex<double> gr_complexd; @@ -64,7 +66,8 @@ namespace std { %template() vector<int>; %template() vector<float>; %template() vector<double>; - // %template() std::complex<float>; + %template() vector<std::string>; + %template() vector<gr_tag_t>; %template() vector< std::complex<float> >; %template() vector< std::vector< unsigned char > >; |