diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2019-02-05 16:47:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 16:47:37 -0800 |
| commit | 13d7e34d8be4316c59bd3d00a1e5526215db6fa4 (patch) | |
| tree | 1a774f323300e72ca2ae66db2d883491f0790d39 /source/slang/parser.cpp | |
| parent | 43950e2b2f2b1109fe25e67fc678272af6dfb7ef (diff) | |
| parent | 60cc9f24c4bec54561bea873ee943aa3d0973dc2 (diff) | |
Merge branch 'master' into fix-nested-type-conformances
Diffstat (limited to 'source/slang/parser.cpp')
| -rw-r--r-- | source/slang/parser.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp index 076111711..b9e3786a2 100644 --- a/source/slang/parser.cpp +++ b/source/slang/parser.cpp @@ -4781,8 +4781,7 @@ namespace Slang addBuiltinSyntax<Decl>(session, scope, #KEYWORD, &CALLBACK) DECL(typedef, ParseTypeDef); DECL(associatedtype, parseAssocType); - DECL(__generic_param, parseGlobalGenericParamDecl); - DECL(type_param, parseGlobalGenericParamDecl); + DECL(type_param, parseGlobalGenericParamDecl); DECL(cbuffer, parseHLSLCBufferDecl); DECL(tbuffer, parseHLSLTBufferDecl); DECL(__generic, ParseGenericDecl); |