diff options
| author | Robin Voetter <robin@voetter.nl> | 2019-09-01 23:45:51 +0200 |
|---|---|---|
| committer | Robin Voetter <robin@voetter.nl> | 2019-09-01 23:45:51 +0200 |
| commit | d62f7c6b605a672f032aff8870496d2ae2366017 (patch) | |
| tree | 659ae46ac0061fcafd3ec29de8682ec1f18e97cc /src/parser.cpp | |
| parent | e7912dee9bd63b03415f441b4de9b3babc79c859 (diff) | |
| parent | 8b1900e5df76a126404c6905b9e91136c738da55 (diff) | |
| download | zig-d62f7c6b605a672f032aff8870496d2ae2366017.tar.gz zig-d62f7c6b605a672f032aff8870496d2ae2366017.zip | |
Merge remote-tracking branch 'upstream/master' into arm-support-improvement
Diffstat (limited to 'src/parser.cpp')
| -rw-r--r-- | src/parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index 6cd6c2f045..21bbc4d246 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -2075,7 +2075,7 @@ static AstNode *ast_parse_param_decl(ParseContext *pc) { res->column = first->start_column; res->data.param_decl.name = token_buf(name); res->data.param_decl.is_noalias = first->id == TokenIdKeywordNoAlias; - res->data.param_decl.is_inline = first->id == TokenIdKeywordCompTime; + res->data.param_decl.is_comptime = first->id == TokenIdKeywordCompTime; return res; } |