Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git

# Conflicts:
#	src/controllers/controllerengine.cpp

1 files changed, 3 insertions, 4 deletions

diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h
index 03089261b2..85e4e05bb5 100644
--- a/src/analyzer/analyzerwaveform.h
+++ b/src/analyzer/analyzerwaveform.h
@@ -2,12 +2,11 @@
 
 #include <QImage>
 #include <QSqlDatabase>
-
+#include <cmath>
 #include <limits>
 
 #include "analyzer/analyzer.h"
 #include "library/dao/analysisdao.h"
-#include "util/math.h"
 #include "util/performancetimer.h"
 #include "waveform/waveform.h"
 
@@ -20,10 +19,10 @@ inline CSAMPLE scaleSignal(CSAMPLE invalue, FilterIndex index = FilterCount) {
     if (invalue == 0.0) {
         return 0;
     } else if (index == Low || index == Mid) {
-        //return pow(invalue, 2 * 0.5);
+        //return std::pow(invalue, 2 * 0.5);
         return invalue;
     } else {
-        return pow(invalue, 2.0f * 0.316f);
+        return std::pow(invalue, 2.0f * 0.316f);
     }
 }