FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Frederic Bouvier
2010-08-01 17:54:52 +02:00
parent ec3ed8fbcd
commit 3a09d67f59
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simgear/scene/material/Effect.cxx
View 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;