From f968b36d4ed2b194111585605f9a1b5367638fb3 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@kit.edu>
Date: Fri, 15 Mar 2013 02:12:20 -0700
Subject: Squash/rebased martin/ofdm-master onto trial merge branch
Conflicts:
gr-blocks/include/blocks/CMakeLists.txt
---
gnuradio-core/src/lib/swig/gnuradio.i | 5 ++++-
gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
(limited to 'gnuradio-core/src/lib/swig')
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 > >;
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h b/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h
index 1994f06609..bbbabaf07b 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h
@@ -40,6 +40,7 @@ class gr_msg_queue;
class gr_sync_block;
class gr_sync_decimator;
class gr_sync_interpolator;
+class gr_tagged_stream_block;
class gr_top_block;
#endif /* INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H */
--
cgit v1.2.3