Merge pull request #47 from stefunctional/main

Forward-declare non-flat uniffi enums
NordSecurity · Sep 27, 2024 · 6902e78 · 6902e78
2 parents 1521029 + 736d659
commit 6902e78
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/bindgen/src/bindings/cpp/templates/wrapper.hpp b/bindgen/src/bindings/cpp/templates/wrapper.hpp
@@ -30,14 +30,12 @@ namespace {{ namespace }} {
 {%- match typ %}
 {%- when Type::Enum { module_path, name } %}
 {%- let e = ci|get_enum_definition(name) %}
-{%- if ci.is_name_used_as_error(name) %}
+{%- if ci.is_name_used_as_error(name) || !e.is_flat() %}
 struct {{ name }};
 {%- else %}
-{%- if e.is_flat() %}
 enum class {{ name }};
 {%- endif %}
-{%- endif %}
-{%- when Type::Record { module_path, name } %} 
+{%- when Type::Record { module_path, name } %}
 struct {{ name }};
 {%- when Type::Object { module_path, name, imp } %}
 struct {{ name }};