diff --git a/pybindgen/module.py b/pybindgen/module.py index 7cab8bb..c4dcbed 100644 --- a/pybindgen/module.py +++ b/pybindgen/module.py @@ -676,14 +676,20 @@ class ModuleBase(dict): if self.parent is None: ## generate the include directives (only the root module) + + forward_declarations_sink = MemoryCodeSink() + + if not self._forward_declarations_declared: + self.generate_forward_declarations(forward_declarations_sink) + self.after_forward_declarations.flush_to(forward_declarations_sink) + if self.parent is None: for include in self.includes: out.get_includes_code_sink().writeln("#include %s" % include) + self.includes = None + forward_declarations_sink.flush_to(out.get_includes_code_sink()) - if not self._forward_declarations_declared: - self.generate_forward_declarations(out.get_includes_code_sink()) - self.after_forward_declarations.flush_to(out.get_includes_code_sink()) else: assert module_file_base_name is None, "only root modules can generate with alternate module_file_base_name" diff --git a/pybindgen/wrapper_registry.py b/pybindgen/wrapper_registry.py index 992ffa7..7af24f7 100644 --- a/pybindgen/wrapper_registry.py +++ b/pybindgen/wrapper_registry.py @@ -68,9 +68,10 @@ class StdMapWrapperRegistry(WrapperRegistry): self.map_name = "%s_wrapper_registry" % base_name def generate_forward_declarations(self, code_sink, module): - #module.add_include("") - code_sink.writeln("#include ") - code_sink.writeln("#include ") + module.add_include("") + module.add_include("") + #code_sink.writeln("#include ") + #code_sink.writeln("#include ") code_sink.writeln("extern std::map %s;" % self.map_name) def generate(self, code_sink, dummy_module):