diff options
author | Neil <nyamatongwe@gmail.com> | 2015-04-09 15:13:08 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2015-04-09 15:13:08 +1000 |
commit | fa76ae534b15c7af787b79b146b0fd9ae95d36ce (patch) | |
tree | 68c523054d294188cb345be4ab988b69aadb6926 | |
parent | 661c690ac383b39e10fc7f5d0c0de2d5ecd8c035 (diff) | |
download | scintilla-mirror-fa76ae534b15c7af787b79b146b0fd9ae95d36ce.tar.gz |
Avoid "absolute-value" warning from clang 3.6.
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 4 | ||||
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 1 |
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> |