From a2f0e0e7914af30bd28ad68745f85e456189a489 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 20 Jan 2017 14:46:39 +0100 Subject: [PATCH] Fix compilation with MSVC 2010 --- hlsl/hlslParseHelper.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 6fb6c784..fca8452a 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -1079,11 +1079,10 @@ void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable) { const TType& type = variable.getType(); - // emplace gives back a pair whose .first is an iterator to the item... - auto entry = flattenMap.emplace(variable.getUniqueId(), - TFlattenData(type.getQualifier().layoutBinding)); + auto entry = flattenMap.insert(std::make_pair(variable.getUniqueId(), + TFlattenData(type.getQualifier().layoutBinding))); - // ... and the item is a map pair, so first->second is the TFlattenData itself. + // the item is a map pair, so first->second is the TFlattenData itself. flatten(loc, variable, type, entry.first->second, ""); } @@ -1895,7 +1894,7 @@ TIntermTyped* HlslParseContext::handleAssign(const TSourceLoc& loc, TOperator op if (split && derefType.isBuiltInInterstageIO(language)) { // copy from interstage IO builtin if needed - subTree = intermediate.addSymbol(*interstageBuiltInIo.find(tInterstageIoData(derefType, outer->getType()))->second); + subTree = intermediate.addSymbol(*interstageBuiltInIo[tInterstageIoData(derefType, outer->getType())]); } else if (flattened && isFinalFlattening(derefType)) { subTree = intermediate.addSymbol(*flatVariables[memberIdx++]); } else { -- 2.34.1