Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add info to store iterator mapping #694

Merged
merged 2 commits into from
Jul 9, 2023
Merged

Add info to store iterator mapping #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe197f
Add info to store iterator mapping
HGuillemet Jul 8, 2023
304564a
Update CHANGELOG.md
saudet Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Let `Parser` map iterators of basic containers systematically ([pull #694](https://github.com/bytedeco/javacpp/pull/694))
* Fix `Parser` for function parameters contained in template arguments ([pull #693](https://github.com/bytedeco/javacpp/pull/693))
* Fix `Parser` on function pointer declarations starting with `typedef struct` ([pull bytedeco/javacpp-presets#1361](https://github.com/bytedeco/javacpp-presets/pull/1361))

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/bytedeco/javacpp/tools/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,9 @@ void containers(Context context, DeclarationList declList) throws ParserExceptio
:
" public native @Name(\"operator *\") " + valueType.annotations + valueType.javaName + " get();\n")
+ " }\n";
if (infoMap.getFirst(containerType.cppName + "::" + iteratorType) == null) {
infoMap.put(new Info(containerType.cppName + "::" + iteratorType).pointerTypes(containerType.javaName + ".Iterator"));
}
}
if (resizable) {
valueType.javaName = removeAnnotations(valueType.javaName);
Expand Down