Skip to content

Commit

Permalink
* Fix Parser failure with auto keyword of C++11 used as placehol…
Browse files Browse the repository at this point in the history
…der type specifier (issue #407)
  • Loading branch information
saudet committed Jun 22, 2020
1 parent e2b39ad commit 7d7c90a
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` failure with `auto` keyword of C++11 used as placeholder type specifier ([issue #407](https://github.com/bytedeco/javacpp/issues/407))
* Add `Builder.configDirectory` option to let `Generator` output files that GraalVM needs for AOT compilation ([issue eclipse/deeplearning4j#7362](https://github.com/eclipse/deeplearning4j/issues/7362))
* Fix `Parser` error on `template<>` containing non-type parameters without names ([issue bytedeco/javacpp-presets#889](https://github.com/bytedeco/javacpp-presets/issues/889))
* Bundle also the `vcruntime140_1.dll` and `msvcp140_1.dll` redist files from Visual Studio
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 @@ -665,7 +665,7 @@ Type type(Context context, boolean definition) throws ParserException {
type.typedef = true;
} else if (token.match(Token.VIRTUAL)) {
type.virtual = true;
} else if (token.match(Token.AUTO, Token.ENUM, Token.EXPLICIT, Token.EXTERN, Token.INLINE, Token.CLASS, Token.FINAL,
} else if (token.match(Token.ENUM, Token.EXPLICIT, Token.EXTERN, Token.INLINE, Token.CLASS, Token.FINAL,
Token.INTERFACE, Token.__INTERFACE, Token.MUTABLE, Token.NAMESPACE, Token.STRUCT, Token.UNION,
Token.TYPENAME, Token.REGISTER, Token.THREAD_LOCAL, Token.VOLATILE)) {
token = tokens.next();
Expand Down

0 comments on commit 7d7c90a

Please sign in to comment.