Untemplate class name before adding them to infoMap

bytedeco · Jan 2, 2024 · 82f2dd2 · 82f2dd2
1 parent a15c408
commit 82f2dd2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/org/bytedeco/javacpp/tools/Parser.java b/src/main/java/org/bytedeco/javacpp/tools/Parser.java
@@ -3657,7 +3657,10 @@ boolean group(Context context, DeclarationList declList) throws ParserException
             if (type.javaName.length() > 0 && context.javaName != null) {
                 type.javaName = context.javaName + "." + type.javaName;
             }
-            infoMap.put(info = new Info(type.cppName).pointerTypes(type.javaName));
+            // Adding this info allows proper ns resolution for next declarations, but
+            // we don't want it to trigger template instantiation, so we untemplate the
+            // name first.
+            infoMap.put(info = new Info(Templates.strip(type.cppName)).pointerTypes(type.javaName));
         }
 
         /* Propagate the need for downcasting from base classes */