diff options
| author | Josh Blum | 2013-05-01 18:16:26 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-05-01 18:16:26 -0700 |
| commit | 14502c92752098e773187890b89db8c763a1ecda (patch) | |
| tree | 8c235f81d7dca0eb165a504f68e9e4b0db758ffb /gnuradio-core | |
| parent | 174060bf4cc236a96ad8f42b19607946ae332a34 (diff) | |
| download | gnuradio-14502c92752098e773187890b89db8c763a1ecda.tar.gz gnuradio-14502c92752098e773187890b89db8c763a1ecda.tar.bz2 gnuradio-14502c92752098e773187890b89db8c763a1ecda.zip | |
gras: use include for pmt_swig.i for swig vector error
Effected ubuntu 11.04 - the std::vector<unsigned int> already defined swig error
Import pmt_swig not include in all cases.
However, gr_feval.i was probably the one causing general to fail
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_feval.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_basic_block.i | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gr_feval.i b/gnuradio-core/src/lib/general/gr_feval.i index bcf4f1e64..c8b7e54da 100644 --- a/gnuradio-core/src/lib/general/gr_feval.i +++ b/gnuradio-core/src/lib/general/gr_feval.i @@ -45,7 +45,7 @@ // Directors are only supported in Python, Java and C# #ifdef SWIGPYTHON -%include "pmt_swig.i" +%import "pmt_swig.i" using namespace pmt; // Enable SWIG directors for these classes diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.i b/gnuradio-core/src/lib/runtime/gr_basic_block.i index 62f16462d..91f3d2cfc 100644 --- a/gnuradio-core/src/lib/runtime/gr_basic_block.i +++ b/gnuradio-core/src/lib/runtime/gr_basic_block.i @@ -23,7 +23,7 @@ class gr_basic_block; typedef boost::shared_ptr<gr_basic_block> gr_basic_block_sptr; %template(gr_basic_block_sptr) boost::shared_ptr<gr_basic_block>; -%include "pmt_swig.i" +%import "pmt_swig.i" using namespace pmt; // support vectors of these... |