hla: Use raw pointers for HLAFederate::_insert methods.

[simgear.git] / simgear / props / condition.cxx

diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx
index d60cb440ffeec4124bc850948505bfb1c080bf99..3770049aabfbdacae57273f0c8cb87db08e27de9 100644 (file)
--- a/simgear/props/condition.cxx
+++ b/simgear/props/condition.cxx
@@ -18,7 +18,6 @@
 #include "props.hxx"
 #include "condition.hxx"
 
-#include <simgear/math/SGMath.hxx>
 #include <simgear/structure/SGExpression.hxx>
 
 using std::istream;
@@ -297,19 +296,19 @@ doComparison (const SGPropertyNode * left, const SGPropertyNode * right, const S
   }
   case props::INT:
     return doComp<int>(left->getIntValue(), right->getIntValue(), 
-           precision ? abs(precision->getIntValue()/2) : 0 );
+           precision ? std::abs(precision->getIntValue()/2) : 0 );
 
   case props::LONG:
     return doComp<long>(left->getLongValue(), right->getLongValue(), 
-           precision ? abs(precision->getLongValue()/2L) : 0L );
+           precision ? std::abs(precision->getLongValue()/2L) : 0L );
 
   case props::FLOAT:
     return doComp<float>(left->getFloatValue(), right->getFloatValue(), 
-           precision ? fabs(precision->getFloatValue()/2.0f) : 0.0f );
+           precision ? std::fabs(precision->getFloatValue()/2.0f) : 0.0f );
 
   case props::DOUBLE:
     return doComp<double>(left->getDoubleValue(), right->getDoubleValue(), 
-           precision ? fabs(precision->getDoubleValue()/2.0) : 0.0 );
+           precision ? std::fabs(precision->getDoubleValue()/2.0) : 0.0 );
 
   case props::STRING:
   case props::NONE: