diff options
| author | Josh Blum | 2012-11-15 00:43:33 -0800 |
|---|---|---|
| committer | Josh Blum | 2012-11-15 00:43:33 -0800 |
| commit | 003319bb7aca18e14f513d92adba3dd58f2d2e08 (patch) | |
| tree | ef0ee0033f3e72c1c285783dc71584b3b7e77212 | |
| parent | fe61c4c8f6b3f1830b5f531b9c7d47936cd6ef82 (diff) | |
| download | sandhi-003319bb7aca18e14f513d92adba3dd58f2d2e08.tar.gz sandhi-003319bb7aca18e14f513d92adba3dd58f2d2e08.tar.bz2 sandhi-003319bb7aca18e14f513d92adba3dd58f2d2e08.zip | |
swig work and created a block.i
| m--------- | gnuradio | 0 | ||||
| -rw-r--r-- | include/gras/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | include/gras/block.i | 15 | ||||
| -rw-r--r-- | include/gras/element.i | 2 | ||||
| -rw-r--r-- | include/gras/io_signature.hpp | 4 | ||||
| -rw-r--r-- | include/gras/tags.i | 1 |
6 files changed, 21 insertions, 2 deletions
diff --git a/gnuradio b/gnuradio -Subproject f70a803adc1cbea01838fa45517ea7cde2e5c24 +Subproject d0b8fdd18e008d921575f41c82aac95e0cc4053 diff --git a/include/gras/CMakeLists.txt b/include/gras/CMakeLists.txt index 8a7ad70..a27ad37 100644 --- a/include/gras/CMakeLists.txt +++ b/include/gras/CMakeLists.txt @@ -4,6 +4,7 @@ install(FILES block.hpp + block.i element.hpp element.i gras.hpp diff --git a/include/gras/block.i b/include/gras/block.i new file mode 100644 index 0000000..e63ffdc --- /dev/null +++ b/include/gras/block.i @@ -0,0 +1,15 @@ +// Copyright (C) by Josh Blum. See LICENSE.txt for licensing information. + +#ifndef INCLUDED_GRAS_BLOCK_I +#define INCLUDED_GRAS_BLOCK_I + +%{ +#include <gras/block.hpp> +%} + +%include <gras/element.i> +%include <gras/tags.i> +%include <gras/sbuffer.hpp> +%include <gras/block.hpp> + +#endif /*INCLUDED_GRAS_BLOCK_I*/ diff --git a/include/gras/element.i b/include/gras/element.i index 72d9f25..d0067a3 100644 --- a/include/gras/element.i +++ b/include/gras/element.i @@ -16,6 +16,8 @@ // Export swig element comprehension //////////////////////////////////////////////////////////////////////// %include <std_string.i> +%include <gras/gras.hpp> +%include <gras/io_signature.i> %include <gras/element.hpp> //////////////////////////////////////////////////////////////////////// diff --git a/include/gras/io_signature.hpp b/include/gras/io_signature.hpp index cdc4f62..a637c2c 100644 --- a/include/gras/io_signature.hpp +++ b/include/gras/io_signature.hpp @@ -54,8 +54,8 @@ struct IOSignature : std::vector<size_t> this->set_max_streams(IO_INFINITE); } - //! Construct from posize_ter for backwards compatible shared_ptr usage. - IOSignature(const IOSignature *sig) + //! Construct from pointer for backwards compatible shared_ptr usage. + explicit IOSignature(const IOSignature *sig) { *this = *sig; } diff --git a/include/gras/tags.i b/include/gras/tags.i index 1df9cd2..ae85bea 100644 --- a/include/gras/tags.i +++ b/include/gras/tags.i @@ -7,6 +7,7 @@ #include <gras/tags.hpp> %} +%include <gras/gras.hpp> %include <gras/tags.hpp> %include <PMC/PMC.i> |