From 4e2f05da416ed736b04029c3ab17bef7637aa62c Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Tue, 29 Aug 2017 12:36:09 -0600 Subject: [PATCH] Build: Fix #1036: size_t warning. --- hlsl/hlslParseHelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 9ad71984..929bf419 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -5095,7 +5095,7 @@ void HlslParseContext::expandArguments(const TSourceLoc& loc, const TFunction& f const auto setArgList = [&](int paramNum, const TVector& args) { if (args.size() == 1) setArg(paramNum, args.front()); - else { + else if (args.size() > 1) { if (function.getParamCount() + functionParamNumberOffset == 1) { arguments = intermediate.makeAggregate(args.front()); std::for_each(args.begin() + 1, args.end(), @@ -5106,8 +5106,8 @@ void HlslParseContext::expandArguments(const TSourceLoc& loc, const TFunction& f auto it = aggregate->getSequence().erase(aggregate->getSequence().begin() + paramNum); aggregate->getSequence().insert(it, args.begin(), args.end()); } + functionParamNumberOffset += (int)(args.size() - 1); } - functionParamNumberOffset += (args.size() - 1); }; // Process each argument's conversion