Compile with MSVC10

diff --git a/simgear/scene/sky/dome.cxx b/simgear/scene/sky/dome.cxx
index cea4b6cffde9f1c55993758b03c7bb335bb2dd88..def2c85cc5d6e8178fc0ad5e531860fe01c9142f 100644 (file)
--- a/simgear/scene/sky/dome.cxx
+++ b/simgear/scene/sky/dome.cxx
@@ -24,6 +24,7 @@
 #endif
 
 #include <math.h>
+#include <iterator>
 
 #include <simgear/compiler.h>
 

diff --git a/simgear/structure/SGExpression.cxx b/simgear/structure/SGExpression.cxx
index d534aad07274fa698a28e4d4c6f248c905a19ab7..dc0d3270baeacded83a09186f0447e8856050b06 100644 (file)
--- 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<Expression*>::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<VariableBinding>::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<VariableBinding>::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;