Prevent Context.qualify to add template arguments if some are already…

… present
HGuillemet · Jan 8, 2024 · 108b9f3 · 108b9f3
1 parent 2e1f5c9
commit 108b9f3
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/src/main/java/org/bytedeco/javacpp/tools/Context.java b/src/main/java/org/bytedeco/javacpp/tools/Context.java
@@ -99,24 +99,26 @@ String[] qualify(String cppName, String parameters) {
                 name = name.substring(0, name.length() - parameters.length());
             }
             TemplateMap map = templateMap;
-            while (map != null) {
-                String name2 = map.getName();
-                if (parameters != null && name2 != null && name2.endsWith(parameters)) {
-                    name2 = name2.substring(0, name2.length() - parameters.length());
-                }
-                if (name.equals(name2)) {
-                    String args = "<", separator = "";
-                    for (Type t : map.values()) {
-                        // assume that missing arguments have default values
-                        if (t != null) {
-                            args += separator + t.cppName;
-                            separator = ",";
+            if (!name.endsWith(">")) {
+                while (map != null) {
+                    String name2 = map.getName();
+                    if (parameters != null && name2 != null && name2.endsWith(parameters)) {
+                        name2 = name2.substring(0, name2.length() - parameters.length());
+                    }
+                    if (name.equals(name2)) {
+                        String args = "<", separator = "";
+                        for (Type t : map.values()) {
+                            // assume that missing arguments have default values
+                            if (t != null) {
+                                args += separator + t.cppName;
+                                separator = ",";
+                            }
                         }
+                        names.add(name + args + (args.endsWith(">") ? " >" : ">") + (parameters != null ? parameters : ""));
+                        break;
                     }
-                    names.add(name + args + (args.endsWith(">") ? " >" : ">") + (parameters != null ? parameters : ""));
-                    break;
+                    map = map.parent;
                 }
-                map = map.parent;
             }
             names.add(name);