Skip to content

Commit

Permalink
Merge remote-tracking branch 'HGuillemet/fix_info_template' into fix_…
Browse files Browse the repository at this point in the history
…info_template
  • Loading branch information
HGuillemet committed Jan 8, 2024
2 parents 108b9f3 + 84cfdc8 commit 01ee71e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
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 @@ -770,7 +770,7 @@ Type[] templateArguments(Context context) throws ParserException {

/**
* Read and return the operator following an operator keyword:
* any of new, delete, + - * / % ^ & | ~ ! = < > += -= *= /= %= ^= &= |= << >> >>= <<= == != <= >= <=>(since C++20) && || ++ -- , ->* -> ( ) [ ]
* any of {@code new, delete, + - * / % ^ & | ~ ! = < > += -= *= /= %= ^= &= |= << >> >>= <<= == != <= >= <=>(since C++20) && || ++ -- , ->* -> ( ) [ ]}
* taking care of template arguments, if any.
*/
private String operator(Context context) throws ParserException {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/bytedeco/javacpp/tools/Templates.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Templates {

static final Pattern templatePattern = Pattern.compile("<[^<>=]*>");

/** Remove template arguments from s, taking care of nested templates, default arguments (xxx<>), operator <=>, ->, etc... */
/** Remove template arguments from s, taking care of nested templates, default arguments {@code (xxx<>), operator <=>, ->}, etc */
static String strip(String s) {
Matcher m;
do {
Expand Down

0 comments on commit 01ee71e

Please sign in to comment.