diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-05-14 18:37:37 +0100 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-14 18:37:37 +0100 |
| commit | 2d730ff30deb7c84a88b64b7fb14a1fe69d79022 (patch) | |
| tree | 46f5f19ce57735d16bc3c10fa4f2a90f9d116384 /gr-utils | |
| parent | 0641a4499d751f6facc151889d0ba50910cb0c6d (diff) | |
| parent | 4850598303359963de1b84791f0d66b8f9c9ad9c (diff) | |
Merge branch 'maint'
Conflicts:
gr-utils/src/python/modtool/templates.py
Diffstat (limited to 'gr-utils')
| -rw-r--r-- | gr-utils/src/python/modtool/templates.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gr-utils/src/python/modtool/templates.py b/gr-utils/src/python/modtool/templates.py index a4a0223e89..0e5fba25cc 100644 --- a/gr-utils/src/python/modtool/templates.py +++ b/gr-utils/src/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 |