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

Fix type javaNames #367

Merged
merged 3 commits into from
Dec 8, 2019
Merged

Fix type javaNames #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
966874c
Fix type javaNames
louxiu Dec 6, 2019
531cec6
Update CHANGELOG.md
saudet Dec 8, 2019
a71d7c6
Merge branch 'master' into java_names
saudet Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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` rename types using `Info.javaNames` in addition to `valueTypes` and `pointerTypes` ([pull #367](https://github.com/bytedeco/javacpp/pull/367))
* Include in the defaults of `InfoMap` mappings missing for the `std::array` and `jchar` types
* Fix various `Parser` failures with attributes on constructors, empty macros, enum classes, friend classes, inherited constructors, and keywords in parameter names
* Add to `Parser` support for C++11 attributes found within `[[` and `]]` brackets
Expand Down
5 changes: 4 additions & 1 deletion 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 @@ -835,7 +835,10 @@ Type type(Context context, boolean definition) throws ParserException {
} else if (info.pointerTypes != null && info.pointerTypes.length > 0) {
type.javaName = info.pointerTypes[0];
type.javaNames = info.pointerTypes;
}
} else if (info.javaNames != null && info.javaNames.length > 0) {
type.javaName = info.javaNames[0];
type.javaNames = info.javaNames;
}
}

if (type.operator) {
Expand Down