summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2011-10-20 22:36:24 -0700
committerJosh Blum2011-10-20 22:36:24 -0700
commit7b1c5abe410470d25e49d0dadd265c430aaca1ec (patch)
tree2b3bb86935b601f04b7ced6e19b511a34149a470
parente44d194f944aa0a66a543286a36fa05c34c4db3e (diff)
downloadgnuradio-7b1c5abe410470d25e49d0dadd265c430aaca1ec.tar.gz
gnuradio-7b1c5abe410470d25e49d0dadd265c430aaca1ec.tar.bz2
gnuradio-7b1c5abe410470d25e49d0dadd265c430aaca1ec.zip
pmt: fix #446 by putting pmt swig into namespace
-rw-r--r--gruel/src/swig/pmt_swig.i12
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