aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2015-04-09 15:13:08 +1000
committerNeil <nyamatongwe@gmail.com>2015-04-09 15:13:08 +1000
commit6c24033d631e9aec3bd265e34306d4e35ae4021f (patch)
tree3e1e2c95fd0320a759264ca69c7c5ce305f6053a
parent0a7e7a8274d32341822d77fa29083b4d434422f6 (diff)
downloadscintilla-mirror-6c24033d631e9aec3bd265e34306d4e35ae4021f.tar.gz
Avoid "absolute-value" warning from clang 3.6.
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp4
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 1c34a5b0b..7cb72e319 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -168,8 +168,8 @@ void ScintillaQt::SelectionChanged()
bool ScintillaQt::DragThreshold(Point ptStart, Point ptNow)
{
- int xMove = abs(ptStart.x - ptNow.x);
- int yMove = abs(ptStart.y - ptNow.y);
+ int xMove = std::abs(ptStart.x - ptNow.x);
+ int yMove = std::abs(ptStart.y - ptNow.y);
return (xMove > QApplication::startDragDistance()) ||
(yMove > QApplication::startDragDistance());
}
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index e494ceecc..a681d150f 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -17,6 +17,7 @@
#include <assert.h>
#include <ctype.h>
#include <time.h>
+#include <cmath>
#include <stdexcept>
#include <string>
#include <vector>