Command-manager supports functors.

[simgear.git] / simgear / structure / SGExpression.cxx

diff --git a/simgear/structure/SGExpression.cxx b/simgear/structure/SGExpression.cxx
index b14a5a50190568615947f92aa6f8c508514cb5bc..df0aa9d747d13b6a0e26d61a9a69f6459b17dd19 100644 (file)
--- a/simgear/structure/SGExpression.cxx
+++ b/simgear/structure/SGExpression.cxx
@@ -27,7 +27,6 @@
 #include "Singleton.hxx"
 
 #include <algorithm>
-#include <functional>
 #include <map>
 #include <utility>
 #include <string>
@@ -866,23 +865,6 @@ Expression* logicopParser(const SGPropertyNode* exp, Parser* parser)
 ExpParserRegistrar andRegistrar("and", logicopParser<AndExpression>);
 ExpParserRegistrar orRegistrar("or", logicopParser<OrExpression>);
 
-Expression* notLogicopParser(const SGPropertyNode* exp, Parser* parser)
-{
-    using namespace boost;
-    vector<Expression*> children;
-    parser->readChildren(exp, children);
-    vector<Expression*>::iterator notBool =
-        find_if(children.begin(), children.end(),
-                boost::bind(&Expression::getType, _1) != BOOL);
-    if (notBool != children.end() || children.size() != 1)
-        throw("non boolean operand to not expression");
-    NotExpression *expr = new NotExpression;
-    expr->setOperand(static_cast< ::SGExpression<bool>*>(children[0]));
-    return expr;
-}
-
-ExpParserRegistrar notRegistrar("not", notLogicopParser);
-
 int BindingLayout::addBinding(const string& name, Type type)
 {
     //XXX error checkint