[QGIS Commit] r11739 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-09-30 20:21:51 -0400 (Wed, 30 Sep 2009)
New Revision: 11739

Modified:
   trunk/qgis/src/core/qgssearchtreenode.cpp
Log:
fix compile error on OSX

Modified: trunk/qgis/src/core/qgssearchtreenode.cpp
===================================================================
--- trunk/qgis/src/core/qgssearchtreenode.cpp	2009-09-30 21:05:26 UTC (rev 11738)
+++ trunk/qgis/src/core/qgssearchtreenode.cpp	2009-10-01 00:21:51 UTC (rev 11739)
@@ -407,25 +407,25 @@
         default:
           return QgsSearchTreeValue( 3, QString::number( mOp ) ); // unknown operator
         case opPOW:
-          if (( val1 == 0 && val2 < 0 ) || ( val2 < 0 && ( val2 - std::floor( val2 ) ) > 0 ) )
+          if (( val1 == 0 && val2 < 0 ) || ( val2 < 0 && ( val2 - floor( val2 ) ) > 0 ) )
           {
             return QgsSearchTreeValue( 4, "Error in power function" );
           }
-          return QgsSearchTreeValue( std::pow( val1, val2 ) );
+          return QgsSearchTreeValue( pow( val1, val2 ) );
         case opSQRT:
-          return QgsSearchTreeValue( std::sqrt( val1 ) );
+          return QgsSearchTreeValue( sqrt( val1 ) );
         case opSIN:
-          return QgsSearchTreeValue( std::sin( val1 ) );
+          return QgsSearchTreeValue( sin( val1 ) );
         case opCOS:
-          return QgsSearchTreeValue( std::cos( val1 ) );
+          return QgsSearchTreeValue( cos( val1 ) );
         case opTAN:
-          return QgsSearchTreeValue( std::tan( val1 ) );
+          return QgsSearchTreeValue( tan( val1 ) );
         case opASIN:
-          return QgsSearchTreeValue( std::asin( val1 ) );
+          return QgsSearchTreeValue( asin( val1 ) );
         case opACOS:
-          return QgsSearchTreeValue( std::acos( val1 ) );
+          return QgsSearchTreeValue( acos( val1 ) );
         case opATAN:
-          return QgsSearchTreeValue( std::atan( val1 ) );
+          return QgsSearchTreeValue( atan( val1 ) );
       }
     }