Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-core / src / lib / swig / gnuradio.i

diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i
index f3d38c1de6a8521c52b3f41ba920f4409b589d26..7d0241f1c237f22eccb83808cf4de7dc6c562e54 100644 (file)
--- a/gnuradio-core/src/lib/swig/gnuradio.i
+++ b/gnuradio-core/src/lib/swig/gnuradio.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,27 +25,24 @@
 // SWIG interface definition
 ////////////////////////////////////////////////////////////////////////
 
-
-#ifndef SWIGIMPORTED
-// we set the module name on the command line (not any more)
-%module(directors="1") gnuradio_swig_python
-#endif
-
 ////////////////////////////////////////////////////////////////////////
 // Headers
 
-
 %{
+#include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
 #include <gr_types.h>
 #include <stddef.h>            // size_t
 %}
 
 %feature("autodoc","1");
 
-%include <shared_ptr.i>
+// local file
+%include <gr_shared_ptr.i>
+
+// non-local SWIG files
 %include <stl.i>
 %include <std_complex.i>
-
+%include <std_except.i>
 
 typedef std::complex<float>            gr_complex;
 typedef std::complex<double>           gr_complexd;
@@ -60,7 +57,15 @@ namespace std {
   %template()    vector<int>;
   %template()    vector<float>;
   %template()    vector<double>;
-  %template()    vector<std::complex<float> >;
+
+  %template()    vector< std::complex<float> >;
+  %template()     vector< std::vector< unsigned char > >;
+  %template()     vector< std::vector< char > >;
+  %template()     vector< std::vector< short > >;
+  %template()     vector< std::vector< int > >;
+  %template()     vector< std::vector< float > >;
+  %template()     vector< std::vector< double > >;
+  %template()     vector< std::vector< std::complex<float> > >;
 };
 
 ////////////////////////////////////////////////////////////////////////
@@ -74,11 +79,9 @@ namespace std {
 
 ////////////////////////////////////////////////////////////////////////
 
-%include <runtime.i>
-%include <general.i>
-%include <filter.i>
-%include <io.i>
-
-// %include <atsc.i>
+#ifndef SW_RUNTIME
+// import runtime.i for all but sw_runtime, since it needs to %include
+%import <runtime.i>
+#endif
 
 ////////////////////////////////////////////////////////////////////////