diff options
| author | Tom Rondeau | 2011-10-22 14:25:13 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-22 14:25:13 -0400 |
| commit | da5563356afe3f50eb2560b5106a81776da7a43f (patch) | |
| tree | b2c9c7bb0a1e8948f2507a38e595e5cc557799d7 /gruel | |
| parent | 1468be3299036606b678664ba84d0c0870266c9c (diff) | |
| parent | 31268cfb68965dbcf3df4912059f0c5b6d744626 (diff) | |
| download | gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.tar.gz gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.tar.bz2 gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.zip | |
Merge remote branch 'jblum/cmake_fixes' into next
Diffstat (limited to 'gruel')
| -rw-r--r-- | gruel/src/swig/pmt_swig.i | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gruel/src/swig/pmt_swig.i b/gruel/src/swig/pmt_swig.i index 34c7d4b7c..276d232a4 100644 --- a/gruel/src/swig/pmt_swig.i +++ b/gruel/src/swig/pmt_swig.i @@ -20,7 +20,6 @@ * Boston, MA 02110-1301, USA. */ -%module pmt %include "std_string.i" %include "stdint.i" %{ @@ -33,7 +32,6 @@ #include <iosfwd> #include <stdexcept> #include <gruel/pmt.h> -using namespace pmt; %} //////////////////////////////////////////////////////////////////////// @@ -55,10 +53,14 @@ using namespace pmt; } // Template intrusive_ptr for Swig to avoid dereferencing issues -class pmt_base; +namespace pmt{ + class pmt_base; +} //%import <intrusive_ptr.i> %import <gr_intrusive_ptr.i> -%template(swig_int_ptr) boost::intrusive_ptr<pmt_base>; +%template(swig_int_ptr) boost::intrusive_ptr<pmt::pmt_base>; + +namespace pmt{ typedef boost::intrusive_ptr<pmt_base> pmt_t; @@ -777,3 +779,5 @@ std::string pmt_serialize_str(pmt_t obj); * \brief Provide a simple string generating interface to pmt's deserialize function */ pmt_t pmt_deserialize_str(std::string str); + +} //namespace pmt |