Improve (mostly Canvas event related) documentation.

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

diff --git a/simgear/structure/SGExpression.cxx b/simgear/structure/SGExpression.cxx
index 6f292e46faa8ed596044ac30a77560104b4491b9..2633e311fdd7a646688e021d1ed7d53fb20fdc3d 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>
@@ -370,7 +369,7 @@ SGReadExpression(SGPropertyNode *inputRoot, const SGPropertyNode *expression)
             SG_LOG(SG_IO, SG_ALERT, "Cannot read \"" << name << "\" expression: no input found");
             return 0;
         }
-        
+
         SGSharedPtr<SGExpression<T> > inputExpression;
         inputExpression = SGReadExpression<T>(inputRoot, inputNode);
         if (!inputExpression) {
@@ -866,7 +865,7 @@ Expression* logicopParser(const SGPropertyNode* exp, Parser* parser)
 ExpParserRegistrar andRegistrar("and", logicopParser<AndExpression>);
 ExpParserRegistrar orRegistrar("or", logicopParser<OrExpression>);
 
-int BindingLayout::addBinding(const string& name, Type type)
+size_t BindingLayout::addBinding(const string& name, Type type)
 {
     //XXX error checkint
     vector<VariableBinding>::iterator itr
@@ -874,7 +873,7 @@ int BindingLayout::addBinding(const string& name, Type type)
                   boost::bind(&VariableBinding::name, _1) == name);
     if (itr != bindings.end())
         return itr->location;
-    int result = bindings.size();
+    size_t result = bindings.size();
     bindings.push_back(VariableBinding(name, type, bindings.size()));
     return result;
 }