From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Sun, 1 Aug 2010 15:54:52 +0000 (+0200)
Subject: MSVC 10 build: Resolve an ambiguity between boost::bind and std::tr1::bind
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3a09d67f59f2dfc5ca34436c9c9e394605c9beb7;p=simgear.git

MSVC 10 build: Resolve an ambiguity between boost::bind and std::tr1::bind
---

diff --git a/simgear/scene/material/Effect.cxx b/simgear/scene/material/Effect.cxx
index 787a9ce2..a7ccbb59 100644
--- a/simgear/scene/material/Effect.cxx
+++ b/simgear/scene/material/Effect.cxx
@@ -775,11 +775,11 @@ void ShaderProgramBuilder::buildAttribute(Effect* effect, Pass* pass,
     ProgramKey prgKey;
     std::back_insert_iterator<vector<ShaderKey> > inserter(prgKey.shaders);
     transform(pVertShaders.begin(), pVertShaders.end(), inserter,
-              bind(makeShaderKey, _1, Shader::VERTEX));
+              boost::bind(makeShaderKey, _1, Shader::VERTEX));
     transform(pGeomShaders.begin(), pGeomShaders.end(), inserter,
-              bind(makeShaderKey, _1, Shader::GEOMETRY));
+              boost::bind(makeShaderKey, _1, Shader::GEOMETRY));
     transform(pFragShaders.begin(), pFragShaders.end(), inserter,
-              bind(makeShaderKey, _1, Shader::FRAGMENT));
+              boost::bind(makeShaderKey, _1, Shader::FRAGMENT));
     for (PropertyList::iterator itr = pAttributes.begin(),
              e = pAttributes.end();
          itr != e;