Merge branch 'overloaded-400' of github.com:KhronosGroup/glslang

This commit is contained in:
John Kessenich
2016-08-23 18:20:19 -06:00
9 changed files with 934 additions and 16 deletions

View File

@@ -3554,10 +3554,10 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu
// exact match not found, look through a list of overloaded functions of the same name
const TFunction* candidate = nullptr;
TVector<TFunction*> candidateList;
TVector<const TFunction*> candidateList;
symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn);
for (TVector<TFunction*>::const_iterator it = candidateList.begin(); it != candidateList.end(); ++it) {
for (auto it = candidateList.begin(); it != candidateList.end(); ++it) {
const TFunction& function = *(*it);
// to even be a potential match, number of arguments has to match