use cmath

* avoid using #include <math.h>
* add std:: namespace prefix when calling <cmath> functions
* use <cstdlib> for std::abs() on integral types

3 files changed, 6 insertions, 9 deletions

diff --git a/fsa/src/vespa/fsa/detector.cpp b/fsa/src/vespa/fsa/detector.cpp
index f9e92c994d5..196d6908342 100644
--- a/fsa/src/vespa/fsa/detector.cpp
+++ b/fsa/src/vespa/fsa/detector.cpp
@@ -14,8 +14,7 @@
 
 #include <list>
 #include <algorithm>
-
-#include <math.h>
+#include <cmath>
 
 #include "detector.h"
 #include "fsa.h"
diff --git a/fsa/src/vespa/fsa/unicode.cpp b/fsa/src/vespa/fsa/unicode.cpp
index 4a35e79ff12..ee0cdad1766 100644
--- a/fsa/src/vespa/fsa/unicode.cpp
+++ b/fsa/src/vespa/fsa/unicode.cpp
@@ -6,7 +6,7 @@
 #include "unicode.h"
 
 #include <assert.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace fsa {
 
@@ -521,7 +521,7 @@ int Unicode::utf8move(unsigned const char* start, size_t length,
 
   if (offset == 0) // Enough room to make it..
   {
-    int moved = abs(p - pos);
+    int moved = std::abs(p - pos);
     pos = p;
     return moved;
   }
diff --git a/fsa/src/vespa/fsa/vectorizer.cpp b/fsa/src/vespa/fsa/vectorizer.cpp
index 54c67fdc800..41f3ce66965 100644
--- a/fsa/src/vespa/fsa/vectorizer.cpp
+++ b/fsa/src/vespa/fsa/vectorizer.cpp
@@ -13,13 +13,11 @@
 
 #include <list>
 #include <algorithm>
-
-#include <math.h>
+#include <cmath>
 
 #include "vectorizer.h"
 #include "fsa.h"
 
-
 namespace fsa {
 
 // {{{ Vectorizer::TfIdf::weight
@@ -35,7 +33,7 @@ double Vectorizer::TfIdf::weight(unsigned int tfnorm, unsigned int idfnorm,
   else{
     tf_n = (double)_tf/tfnorm;
     if(tfexp!=1.0 && tf_n!=0.0){
-      tf_n = exp(tfexp*log(tf_n));
+      tf_n = std::exp(tfexp * std::log(tf_n));
     }
   }
 
@@ -47,7 +45,7 @@ double Vectorizer::TfIdf::weight(unsigned int tfnorm, unsigned int idfnorm,
     if(idf_n<0.0)
       idf_n = 0.0;
     if(idfexp!=1.0 && idf_n!=0.0){
-      idf_n = exp(idfexp*log(idf_n));
+      idf_n = std::exp(idfexp * std::log(idf_n));
     }
   }