diff options
-rw-r--r-- | include/gras/CMakeLists.txt | 1 | ||||
-rw-r--r-- | include/gras/element.i | 2 | ||||
-rw-r--r-- | include/gras/io_signature.i | 32 | ||||
-rw-r--r-- | python/gras/GRASElements.i | 13 |
4 files changed, 35 insertions, 13 deletions
diff --git a/include/gras/CMakeLists.txt b/include/gras/CMakeLists.txt index d5607c9..628acfb 100644 --- a/include/gras/CMakeLists.txt +++ b/include/gras/CMakeLists.txt @@ -9,6 +9,7 @@ install(FILES gras.hpp hier_block.hpp io_signature.hpp + io_signature.i sbuffer.hpp sbuffer.ipp tags.hpp diff --git a/include/gras/element.i b/include/gras/element.i index aa197c5..c4ff853 100644 --- a/include/gras/element.i +++ b/include/gras/element.i @@ -18,9 +18,7 @@ #define INCLUDED_GRAS_ELEMENT_I %{ - #include <gras/element.hpp> - %} %include <std_string.i> diff --git a/include/gras/io_signature.i b/include/gras/io_signature.i new file mode 100644 index 0000000..3258ab5 --- /dev/null +++ b/include/gras/io_signature.i @@ -0,0 +1,32 @@ +// +// Copyright 2012 Josh Blum +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. + +#ifndef INCLUDED_GRAS_IO_SIGNATURE_I +#define INCLUDED_GRAS_IO_SIGNATURE_I + +%{ +#include <gras/io_signature.hpp> +%} + +%ignore gras::IOSignature::operator->(); +%ignore gras::IOSignature::operator->() const; + +%include <std_vector.i> +%template () std::vector<int>; + +%include <gras/io_signature.hpp> + +#endif /*INCLUDED_GRAS_IO_SIGNATURE_I*/ diff --git a/python/gras/GRASElements.i b/python/gras/GRASElements.i index 12854a9..413ee2a 100644 --- a/python/gras/GRASElements.i +++ b/python/gras/GRASElements.i @@ -36,25 +36,16 @@ %{ #include <gras/hier_block.hpp> #include <gras/top_block.hpp> -#include <gras/io_signature.hpp> %} -//////////////////////////////////////////////////////////////////////// -//helps with funny swig error for io signature -//////////////////////////////////////////////////////////////////////// -%ignore gras::IOSignature::operator->(); -%ignore gras::IOSignature::operator->() const; - -%include <std_vector.i> -%template () std::vector<int>; +%include <gras/element.i> +%include <gras/io_signature.i> //////////////////////////////////////////////////////////////////////// // pull in hier and top interface //////////////////////////////////////////////////////////////////////// -%include <gras/element.i> %include <gras/hier_block.hpp> %include <gras/top_block.hpp> -%include <gras/io_signature.hpp> //////////////////////////////////////////////////////////////////////// // Make a special top block with python safe unlocking wait |