diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 1fa5428a..070089c5 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1438" -#define GLSLANG_DATE "25-Aug-2016" +#define GLSLANG_REVISION "Overload400-PrecQual.1442" +#define GLSLANG_DATE "26-Aug-2016" diff --git a/glslang/MachineIndependent/ParseContextBase.cpp b/glslang/MachineIndependent/ParseContextBase.cpp index b3a2223f..4c1d02a8 100644 --- a/glslang/MachineIndependent/ParseContextBase.cpp +++ b/glslang/MachineIndependent/ParseContextBase.cpp @@ -70,7 +70,7 @@ namespace glslang { // caller's choice for how to report) // const TFunction* TParseContextBase::selectFunction( - TVector candidateList, + const TVector candidateList, const TFunction& call, std::function convertible, std::function better, diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp index 849302cc..42dafbd1 100644 --- a/glslang/MachineIndependent/ParseHelper.cpp +++ b/glslang/MachineIndependent/ParseHelper.cpp @@ -4991,7 +4991,7 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn); // can 'from' convert to 'to'? - auto convertible = [this](const TType& from, const TType& to) { + const auto convertible = [this](const TType& from, const TType& to) { if (from == to) return true; if (from.isArray() || to.isArray() || ! from.sameElementShape(to)) @@ -5002,7 +5002,7 @@ const TFunction* TParseContext::findFunction400(const TSourceLoc& loc, const TFu // Is 'to2' a better conversion than 'to1'? // Ties should not be considered as better. // Assumes 'convertible' already said true. - auto better = [](const TType& from, const TType& to1, const TType& to2) { + const auto better = [](const TType& from, const TType& to1, const TType& to2) { // 1. exact match if (from == to2) return from != to1; diff --git a/glslang/MachineIndependent/ParseHelper.h b/glslang/MachineIndependent/ParseHelper.h index 98f98256..19830399 100644 --- a/glslang/MachineIndependent/ParseHelper.h +++ b/glslang/MachineIndependent/ParseHelper.h @@ -144,7 +144,7 @@ protected: std::function errorCallback; // see implementation for detail - const TFunction* selectFunction(TVector, const TFunction&, + const TFunction* selectFunction(const TVector, const TFunction&, std::function, std::function, /* output */ bool& tie); diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index f4a71289..2b5d6c0f 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -3563,7 +3563,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu symbolTable.findFunctionNameList(call.getMangledName(), candidateList, builtIn); // can 'from' convert to 'to'? - auto convertible = [this](const TType& from, const TType& to) { + const auto convertible = [this](const TType& from, const TType& to) { if (from == to) return true; @@ -3590,7 +3590,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu // Is 'to2' a better conversion than 'to1'? // Ties should not be considered as better. // Assumes 'convertible' already said true. - auto better = [](const TType& from, const TType& to1, const TType& to2) { + const auto better = [](const TType& from, const TType& to1, const TType& to2) { // exact match is always better than mismatch if (from == to2) return from != to1; @@ -3617,7 +3617,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, const TFu // - 32 vs. 64 bit (or width in general) // - bool vs. non bool // - signed vs. not signed - auto linearize = [](const TBasicType& basicType) { + const auto linearize = [](const TBasicType& basicType) { switch (basicType) { case EbtBool: return 1; case EbtInt: return 10;