diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-07-06 13:15:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 13:15:26 -0700 |
| commit | af8c0eae90c76d2c8f745badf6f743cefe15f777 (patch) | |
| tree | 57632ee0f4b4944b311c0e50173fbeab0fe7d109 /source/slang/preprocessor.cpp | |
| parent | 21a14cb4e0d578bc4f8a460016269a1199cac0da (diff) | |
| parent | 9795ed654e7b8daaff0bef1ccae1507ff659d3bd (diff) | |
Merge pull request #54 from tfoleyNV/falcor-fixes
Fix issues found during testing of v0.4.0 with Falcor
Diffstat (limited to 'source/slang/preprocessor.cpp')
| -rw-r--r-- | source/slang/preprocessor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/slang/preprocessor.cpp b/source/slang/preprocessor.cpp index f84355018..a186ce201 100644 --- a/source/slang/preprocessor.cpp +++ b/source/slang/preprocessor.cpp @@ -600,8 +600,8 @@ static void MaybeBeginMacroExpansion( expansion->environment = &expansion->argumentEnvironment; // Try to read any arguments present. - int paramCount = macro->params.Count(); - int argIndex = 0; + UInt paramCount = macro->params.Count(); + UInt argIndex = 0; switch (PeekRawTokenType(preprocessor)) { @@ -702,7 +702,7 @@ static void MaybeBeginMacroExpansion( GetSink(preprocessor)->diagnose(PeekLoc(preprocessor), Diagnostics::expectedTokenInMacroArguments, TokenType::RParent, PeekRawTokenType(preprocessor)); } - int argCount = argIndex; + UInt argCount = argIndex; if (argCount != paramCount) { // TODO: diagnose |
