Skip to content

Commit

Permalink
* Fix Parser failing on some friend functions for operator ove…
Browse files Browse the repository at this point in the history
…rloading (pull #681)
  • Loading branch information
HGuillemet committed May 21, 2023
1 parent 78b9450 commit bf5e5da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Fix `Parser` failing on some `friend` functions for `operator` overloading ([pull #681](https://github.com/bytedeco/javacpp/pull/681))
* Fix `Parser` incorrectly casting `const` pointers to template arguments of pointer types ([pull #677](https://github.com/bytedeco/javacpp/pull/677))
* Fix `Parser` with `Info.enumerate` failing to translate `enum` values based on other `enum` values
* Fix `Parser` prematurely expanding macros defined in `class`, `struct` or `union` ([issue #674](https://github.com/bytedeco/javacpp/issues/674))
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/bytedeco/javacpp/tools/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -3359,7 +3359,7 @@ boolean group(Context context, DeclarationList declList) throws ParserException
return false;
}
if (!tokens.get().match('{') && tokens.get(1).match(Token.IDENTIFIER)
&& !tokens.get(1).match(Token.FINAL)
&& !tokens.get(1).match(Token.FINAL) && !friend
&& (typedef || !tokens.get(2).match(';'))) {
tokens.next();
}
Expand Down

0 comments on commit bf5e5da

Please sign in to comment.