]> git.mxchange.org Git - simgear.git/commitdiff
MSVC 10 build: Resolve an ambiguity between boost::bind and std::tr1::bind
authorFrederic Bouvier <fredfgfs01@free.fr>
Sun, 1 Aug 2010 15:54:52 +0000 (17:54 +0200)
committerFrederic Bouvier <fredfgfs01@free.fr>
Sun, 1 Aug 2010 16:00:37 +0000 (18:00 +0200)
simgear/scene/material/Effect.cxx

index 787a9ce2eb6834a9a9eda57b84d1a03b4207a326..a7ccbb5968ce183387cdcf38b7622d289668bbf4 100644 (file)
@@ -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;