diff options
author | Terry May <terrydmay@gmail.com> | 2019-09-09 19:45:41 -0400 |
---|---|---|
committer | Martin Braun <martin@gnuradio.org> | 2020-02-18 22:04:15 -0800 |
commit | 64ee803068269fe3b9563fd415c420fb513a1c9b (patch) | |
tree | d27e9b5560b5bb4377f964e39772cd1395a7bff0 /grc/core/generator/FlowGraphProxy.py | |
parent | 012870af22ae873b3b998691de8e81752179d266 (diff) |
grc: Fix C++ code generation
- Added support for C++ std::map<> from python dict
- Fixed default initialization of parameters in main()
- Added missing include for realtime scheduling
- Added default CMake option for std=c++11 as this is required for
gnuradio >= 3.8
- Fixed mako template to add initialization to parameter declarations in
main()
- Fixed C++ constructor initialization list generation
- Fixed parameter type determination when an lvalue is used in an rvalue
expression
- Improved determining type of C++ variables
- Added C++ support for gr_complex parameters
- Fixed C++ generation of nested container types
- Added C++ support for virtual source/sink
- Moved cmake CMAKE_CXX_STANDARD 11 option from options.yml to
CMakeLists.txt.mako
- Fixed qtqui_sink to allow multiple instances
- Revised virtual connection processing in cpp_top_block.py
Reviewed-By: HÃ¥kon Vagsether <hauk142@gmail.com>
Diffstat (limited to 'grc/core/generator/FlowGraphProxy.py')
-rw-r--r-- | grc/core/generator/FlowGraphProxy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grc/core/generator/FlowGraphProxy.py b/grc/core/generator/FlowGraphProxy.py index da95417b1b..0003cb5012 100644 --- a/grc/core/generator/FlowGraphProxy.py +++ b/grc/core/generator/FlowGraphProxy.py @@ -140,7 +140,7 @@ class FlowGraphProxy(object): # TODO: move this in a refactored Generator Returns: a list of #include statements """ - return [block.cpp_templates.render('includes') for block in self.iter_enabled_blocks()] + return [block.cpp_templates.render('includes') for block in self.iter_enabled_blocks() if not (block.is_virtual_sink() or block.is_virtual_source())] def links(self): """ @@ -149,7 +149,7 @@ class FlowGraphProxy(object): # TODO: move this in a refactored Generator Returns: a list of GNU Radio modules """ - return [block.cpp_templates.render('link') for block in self.iter_enabled_blocks()] + return [block.cpp_templates.render('link') for block in self.iter_enabled_blocks() if not (block.is_virtual_sink() or block.is_virtual_source())] def get_hier_block_io(flow_graph, direction, domain=None): """ |