diff options
| author | Yong He <yonghe@outlook.com> | 2019-02-05 18:18:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 18:18:16 -0800 |
| commit | a39fd3d3f67df28b9206c9f08bc7d046f9b0db59 (patch) | |
| tree | a3971c4c6217914e9dc4c12917f26a7eb6ac28b2 /source/slang/parser.cpp | |
| parent | c198eaba351850fcb3d82c2f5117efc0e2e2bf1e (diff) | |
| parent | 60cc9f24c4bec54561bea873ee943aa3d0973dc2 (diff) | |
Merge branch 'master' into gencloser
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 06c7e8a1c..3c879302c 100644 --- a/source/slang/parser.cpp +++ b/source/slang/parser.cpp @@ -4784,8 +4784,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); |