Skip to content

Commit bf5e5da

Browse files
authored
* Fix Parser failing on some friend functions for operator overloading (pull #681)
1 parent 78b9450 commit bf5e5da

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
* Fix `Parser` failing on some `friend` functions for `operator` overloading ([pull #681](https://github.com/bytedeco/javacpp/pull/681))
23
* Fix `Parser` incorrectly casting `const` pointers to template arguments of pointer types ([pull #677](https://github.com/bytedeco/javacpp/pull/677))
34
* Fix `Parser` with `Info.enumerate` failing to translate `enum` values based on other `enum` values
45
* Fix `Parser` prematurely expanding macros defined in `class`, `struct` or `union` ([issue #674](https://github.com/bytedeco/javacpp/issues/674))

src/main/java/org/bytedeco/javacpp/tools/Parser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3359,7 +3359,7 @@ boolean group(Context context, DeclarationList declList) throws ParserException
33593359
return false;
33603360
}
33613361
if (!tokens.get().match('{') && tokens.get(1).match(Token.IDENTIFIER)
3362-
&& !tokens.get(1).match(Token.FINAL)
3362+
&& !tokens.get(1).match(Token.FINAL) && !friend
33633363
&& (typedef || !tokens.get(2).match(';'))) {
33643364
tokens.next();
33653365
}

0 commit comments

Comments
 (0)