Fix regression spotted at #3027

rust-lang · Dec 2, 2024 · f2d2266 · f2d2266
1 parent d8dbe3e
commit f2d2266
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/bindgen-tests/tests/expectations/tests/issue-3027.rs b/bindgen-tests/tests/expectations/tests/issue-3027.rs
diff --git a/bindgen-tests/tests/headers/issue-3027.hpp b/bindgen-tests/tests/headers/issue-3027.hpp
@@ -0,0 +1,6 @@
+// bindgen-flags: --enable-cxx-namespaces
+
+namespace regression {
+    template<unsigned N> class A { char c[N]; };
+    class C { A<3> a; };
+}
diff --git a/bindgen/codegen/helpers.rs b/bindgen/codegen/helpers.rs
@@ -102,7 +102,11 @@ pub(crate) fn blob(
         ty
     } else if ffi_safe && ctx.options().rust_features().min_const_generics {
         ctx.generated_opaque_array();
-        syn::parse_quote! { __BindgenOpaqueArray<#ty, #data_len> }
+        if ctx.options().enable_cxx_namespaces {
+            syn::parse_quote! { root::__BindgenOpaqueArray<#ty, #data_len> }
+        } else {
+            syn::parse_quote! { __BindgenOpaqueArray<#ty, #data_len> }
+        }
     } else {
         // This is not FFI safe as an argument; the struct above is
         // preferable.