summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-26 12:06:38 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-26 12:06:38 +0200
commitb19af8c4edce629bee2ec8de0312e4fcee75a109 (patch)
tree81bda8954b0799eac5a41a4cef5f84f41ac38f97
parentf4417361b0fd580855ec84d3c2159162c4426c43 (diff)
parent420a90d88a246bd7a971952ba19c259e25875c3d (diff)
Merge branch 'unstable' into trackhat-ui
-rw-r--r--qfunctionconfigurator/functionconfig.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qfunctionconfigurator/functionconfig.cpp b/qfunctionconfigurator/functionconfig.cpp
index dc50a4d1..b597a902 100644
--- a/qfunctionconfigurator/functionconfig.cpp
+++ b/qfunctionconfigurator/functionconfig.cpp
@@ -50,7 +50,7 @@ bool Map::getLastPoint(QPointF& point ) {
Map::num Map::getValueInternal(int x) {
num sign = x < 0 ? -1 : 1;
- x = std::abs(x);
+ x = abs(x);
num ret;
int sz = cur.data.size();
if (sz == 0)