From df5a63b059956e8a717db9110327cc86612cc934 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Thu, 9 Jan 2020 11:36:39 +0000 Subject: Fix usage of C++14 features Change-Id: Ibd460eceafdd29d7d88ac2418496dc7002de1095 Reviewed-by: Paul Lemire --- src/render/materialsystem/shaderbuilder.cpp | 4 ++-- src/render/renderers/opengl/renderer/renderviewbuilder.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp index 23f1400c9..7434cd901 100644 --- a/src/render/materialsystem/shaderbuilder.cpp +++ b/src/render/materialsystem/shaderbuilder.cpp @@ -278,7 +278,7 @@ void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) markDirty(AbstractRenderer::ShadersDirty); } - static const std::pair shaderTypesToGetters[] = { + static const QVector> shaderTypesToGetters = { {QShaderProgram::Vertex, &QShaderProgramBuilder::vertexShaderGraph}, {QShaderProgram::TessellationControl, &QShaderProgramBuilder::tessellationControlShaderGraph}, {QShaderProgram::TessellationEvaluation, &QShaderProgramBuilder::tessellationEvaluationShaderGraph}, @@ -287,7 +287,7 @@ void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) {QShaderProgram::Compute, &QShaderProgramBuilder::computeShaderGraph}, }; - for (auto it = std::cbegin(shaderTypesToGetters), end = std::cend(shaderTypesToGetters); it != end; ++it) { + for (auto it = shaderTypesToGetters.cbegin(), end = shaderTypesToGetters.cend(); it != end; ++it) { const QUrl url = (node->*(it->second))(); if (url != m_graphs.value(it->first)) { setShaderGraph(it->first, url); diff --git a/src/render/renderers/opengl/renderer/renderviewbuilder.cpp b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp index 8f1b17119..4034af146 100644 --- a/src/render/renderers/opengl/renderer/renderviewbuilder.cpp +++ b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp @@ -326,8 +326,8 @@ public: filteredCommandData->reserve(renderableEntities.size()); // Because dataCacheForLeaf.renderableEntities or computeEntities are sorted // What we get out of EntityRenderCommandData is also sorted by Entity - auto eIt = std::cbegin(renderableEntities); - const auto eEnd = std::cend(renderableEntities); + auto eIt = renderableEntities.cbegin(); + const auto eEnd = renderableEntities.cend(); int cIt = 0; const int cEnd = commandData.size(); -- cgit v1.2.3