From 430e72b42404cd07685de13c767a9ca443ad1f49 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 2 Sep 2012 12:22:20 +0200 Subject: [PATCH] Ugly hack to please Boost 1.51.0 --- simgear/scene/material/Effect.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simgear/scene/material/Effect.cxx b/simgear/scene/material/Effect.cxx index 2e103185..c9348157 100644 --- a/simgear/scene/material/Effect.cxx +++ b/simgear/scene/material/Effect.cxx @@ -671,9 +671,9 @@ InstallAttributeBuilder installAlphaTest("alpha-test"); InstallAttributeBuilder textureUnitBuilder("texture-unit"); // Shader key, used both for shaders with relative and absolute names -typedef pair ShaderKey; +typedef pair ShaderKey; -inline ShaderKey makeShaderKey(SGPropertyNode_ptr& ptr, Shader::Type shaderType) +inline ShaderKey makeShaderKey(SGPropertyNode_ptr& ptr, int shaderType) { return ShaderKey(ptr->getStringValue(), shaderType); } @@ -815,7 +815,7 @@ void ShaderProgramBuilder::buildAttribute(Effect* effect, Pass* pass, BOOST_FOREACH(const ShaderKey& shaderKey, prgKey.shaders) { const string& shaderName = shaderKey.first; - Shader::Type stype = shaderKey.second; + Shader::Type stype = (Shader::Type)shaderKey.second; string fileName = SGModelLib::findDataFile(shaderName, options); if (fileName.empty()) throw BuilderException(string("couldn't find shader ") + @@ -833,7 +833,7 @@ void ShaderProgramBuilder::buildAttribute(Effect* effect, Pass* pass, BOOST_FOREACH(const ShaderKey& skey, resolvedKey.shaders) { const string& fileName = skey.first; - Shader::Type stype = skey.second; + Shader::Type stype = (Shader::Type)skey.second; ShaderMap::iterator sitr = shaderMap.find(skey); if (sitr != shaderMap.end()) { program->addShader(sitr->second.get()); -- 2.39.5