diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-05-16 15:16:04 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-05-16 15:16:04 +1000 |
| commit | 042c4ca122e38e35c51565e9d2feb97b6890a716 (patch) | |
| tree | 5e1287c13cb056a230c16023d85bf24c92002d3e | |
| parent | 80ba519908fbc6c912494b73ebb0a24103031ba5 (diff) | |
| download | scintilla-mirror-042c4ca122e38e35c51565e9d2feb97b6890a716.tar.gz | |
Avoid some warnings from clang.
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 41122db65..c965dd60f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -12,6 +12,7 @@ #include <ctype.h> #include <limits.h> +#include <cmath> #include <stdexcept> #include <new> #include <string> @@ -115,7 +116,6 @@ typedef UINT_PTR (WINAPI *SetCoalescableTimerSig)(HWND hwnd, UINT_PTR nIDEvent, // GCC has trouble with the standard COM ABI so do it the old C way with explicit vtables. -const TCHAR scintillaClassName[] = TEXT("Scintilla"); const TCHAR callClassName[] = TEXT("CallTip"); #ifdef SCI_NAMESPACE @@ -548,8 +548,8 @@ HWND ScintillaWin::MainHWND() { } bool ScintillaWin::DragThreshold(Point ptStart, Point ptNow) { - int xMove = static_cast<int>(abs(ptStart.x - ptNow.x)); - int yMove = static_cast<int>(abs(ptStart.y - ptNow.y)); + int xMove = static_cast<int>(std::abs(ptStart.x - ptNow.x)); + int yMove = static_cast<int>(std::abs(ptStart.y - ptNow.y)); return (xMove > ::GetSystemMetrics(SM_CXDRAG)) || (yMove > ::GetSystemMetrics(SM_CYDRAG)); } |
