From 9d1cf253b477ed11b8de75ebc29f22e82222190a Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sat, 8 May 2010 17:13:01 +0200 Subject: [PATCH] Compile with MSVC10 --- simgear/scene/sky/dome.cxx | 1 + simgear/structure/SGExpression.cxx | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/simgear/scene/sky/dome.cxx b/simgear/scene/sky/dome.cxx index cea4b6cf..def2c85c 100644 --- a/simgear/scene/sky/dome.cxx +++ b/simgear/scene/sky/dome.cxx @@ -24,6 +24,7 @@ #endif #include +#include #include diff --git a/simgear/structure/SGExpression.cxx b/simgear/structure/SGExpression.cxx index d534aad0..dc0d3270 100644 --- a/simgear/structure/SGExpression.cxx +++ b/simgear/structure/SGExpression.cxx @@ -854,7 +854,7 @@ Expression* logicopParser(const SGPropertyNode* exp, Parser* parser) parser->readChildren(exp, children); vector::iterator notBool = find_if(children.begin(), children.end(), - bind(&Expression::getType, _1) != BOOL); + boost::bind(&Expression::getType, _1) != BOOL); if (notBool != children.end()) throw("non boolean operand to logical expression"); Logicop *expr = new Logicop; @@ -870,7 +870,7 @@ int BindingLayout::addBinding(const string& name, Type type) //XXX error checkint vector::iterator itr = find_if(bindings.begin(), bindings.end(), - bind(&VariableBinding::name, _1) == name); + boost::bind(&VariableBinding::name, _1) == name); if (itr != bindings.end()) return itr->location; int result = bindings.size(); @@ -885,7 +885,7 @@ bool BindingLayout::findBinding(const std::string& name, using namespace boost; vector::const_iterator itr = find_if(bindings.begin(), bindings.end(), - bind(&VariableBinding::name, _1) == name); + boost::bind(&VariableBinding::name, _1) == name); if (itr != bindings.end()) { result = *itr; return true; -- 2.39.5