diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-05-14 18:37:53 +0100 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-14 18:37:53 +0100 |
commit | cc8509daaf1430608b7dad6f0cfe6ca0e9697c00 (patch) | |
tree | 1a62b72efc830aaf32c2683b788ddd9ed0a1db07 /gr-utils/python/modtool/templates.py | |
parent | f7929d0089935a6e5282054720913239abb64dc2 (diff) | |
parent | 2d730ff30deb7c84a88b64b7fb14a1fe69d79022 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gr-utils/python/modtool/templates.py')
-rw-r--r-- | gr-utils/python/modtool/templates.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py index 7fef3f5b4e..740ba5dabd 100644 --- a/gr-utils/python/modtool/templates.py +++ b/gr-utils/python/modtool/templates.py @@ -263,9 +263,10 @@ namespace gr { */ class ${modname.upper()}_API $blockname { + public: ${blockname}(${arglist}); ~${blockname}(); - private: + private: }; #else /*! @@ -529,12 +530,16 @@ gr_modtool help <command> -- Shows the help for a given command. ''' # SWIG string Templates['swig_block_magic'] = """#if $version == '36' +#if $blocktype != 'noblock' GR_SWIG_BLOCK_MAGIC($modname, $blockname); +#end if %include "${modname}_${blockname}.h" #else %include "${modname}/${blockname}.h" +#if $blocktype != 'noblock' GR_SWIG_BLOCK_MAGIC2($modname, $blockname); #end if +#end if """ ## Old stuff |