diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-31 16:08:05 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 16:24:38 -0700 |
| commit | cbb2a6df36c1c367ab983934e179975e00619f8c (patch) | |
| tree | c8f3055e29f8d0fb97c433a5c6856de054657246 | |
| parent | 65bfb22a597854a6ffc7f249a720d11d8b985c9d (diff) | |
build: more work to set up type map templates properly.
| -rw-r--r-- | gnuradio-runtime/swig/gr_types.i | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gnuradio-runtime/swig/gr_types.i b/gnuradio-runtime/swig/gr_types.i index e81d43f40c..b9bf3ba80b 100644 --- a/gnuradio-runtime/swig/gr_types.i +++ b/gnuradio-runtime/swig/gr_types.i @@ -58,11 +58,6 @@ namespace std { %template() vector<float>; %template() vector<double>; - %template() vector< complex<float> >; - %template() vector< complex<double> >; - - %template() vector<gr_complex>; - %template() vector<gr_complexd>; %template() vector< vector< unsigned char > >; %template() vector< vector< char > >; @@ -71,13 +66,15 @@ namespace std { %template() vector< vector< long int> >; %template() vector< vector< float > >; %template() vector< vector< double > >; - %template() vector< vector< complex<float> > >; - %template() vector< vector< gr_complex> >; - %template() vector< vector< gr_complexd> >; %template() vector<string>; }; +%template(gr_vector_complexf) std::vector< std::complex<float> >; +%template(gr_vector_complexd) std::vector< std::complex<double> >; +%template(gr_vector_vector_complexf) std::vector< std::vector< std::complex<float> > >; +%template(gr_vector_vector_complexd) std::vector< std::vector< std::complex<double> > >; + // Fix for Issue #529 #ifdef SIZE_T_32 // On 32-bit systems, whenever we see std::vector<size_t>, replace it |