diff options
| author | Josh Blum | 2012-11-17 12:09:08 -0800 |
|---|---|---|
| committer | Josh Blum | 2012-11-17 12:09:08 -0800 |
| commit | 692c629daa1d265ed6e2c845013c8cf6bec09f78 (patch) | |
| tree | 641bebfdca8586ad147d2ec69100602e550dc526 | |
| parent | 7a09a4bde747c38b9561dcc36e7eed6a99f9ea90 (diff) | |
| download | sandhi-692c629daa1d265ed6e2c845013c8cf6bec09f78.tar.gz sandhi-692c629daa1d265ed6e2c845013c8cf6bec09f78.tar.bz2 sandhi-692c629daa1d265ed6e2c845013c8cf6bec09f78.zip | |
checkin misc changes from horrible swig adventure
| m--------- | gnuradio | 0 | ||||
| -rw-r--r-- | include/gras/element.hpp | 6 | ||||
| -rw-r--r-- | python/gras/GRAS_Block.i | 7 |
3 files changed, 5 insertions, 8 deletions
diff --git a/gnuradio b/gnuradio -Subproject 2663f5e814fd90a11f1e235f68534f526d27d51 +Subproject 90978da3a08a3485ada59f3ca32fe3da97d4bf0 diff --git a/include/gras/element.hpp b/include/gras/element.hpp index c5ebbf8..140a732 100644 --- a/include/gras/element.hpp +++ b/include/gras/element.hpp @@ -11,9 +11,11 @@ namespace gras { -class ElementImpl; +struct ElementImpl; -struct GRAS_API Element : boost::shared_ptr<ElementImpl>, boost::enable_shared_from_this<Element> +typedef boost::shared_ptr<ElementImpl> ElementBase; + +struct GRAS_API Element : ElementBase, boost::enable_shared_from_this<Element> { //! Create an empty element diff --git a/python/gras/GRAS_Block.i b/python/gras/GRAS_Block.i index 718829f..b224b74 100644 --- a/python/gras/GRAS_Block.i +++ b/python/gras/GRAS_Block.i @@ -79,12 +79,7 @@ struct PyGILPhondler #include <iostream> %} -%include <gras/gras.hpp> -%include <gras/element.i> -%include <gras/io_signature.i> -%include <gras/sbuffer.hpp> -%include <gras/tags.i> -%include <gras/block.hpp> +%include <gras/block.i> //////////////////////////////////////////////////////////////////////// // Make a special block with safe overloads |