diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-25 09:31:33 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-25 09:31:33 +0000 |
| commit | 47d6bf375bcfd2a83041e79afcf5720dde5aa383 (patch) | |
| tree | 582f97e0c0061f4fdab0b046dc1b2aabd14180e8 /scintilla/src/PositionCache.cxx | |
| parent | 00fbf8554b38ac1ffe48ccd859a55e1c5a7ba434 (diff) | |
| download | notepad2-mod-47d6bf375bcfd2a83041e79afcf5720dde5aa383.zip notepad2-mod-47d6bf375bcfd2a83041e79afcf5720dde5aa383.tar.gz notepad2-mod-47d6bf375bcfd2a83041e79afcf5720dde5aa383.tar.bz2 | |
update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@552 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src/PositionCache.cxx')
| -rw-r--r-- | scintilla/src/PositionCache.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx index 0a5450f..50d964d 100644 --- a/scintilla/src/PositionCache.cxx +++ b/scintilla/src/PositionCache.cxx @@ -12,6 +12,7 @@ #include <string>
#include <vector>
+#include <map>
#include "Platform.h"
@@ -604,11 +605,11 @@ void PositionCache::MeasureWidths(Surface *surface, ViewStyle &vstyle, unsigned // Two way associative: try two probe positions.
int hashValue = PositionCacheEntry::Hash(styleNumber, s, len);
- probe = hashValue % size;
+ probe = static_cast<int>(hashValue % size);
if (pces[probe].Retrieve(styleNumber, s, len, positions)) {
return;
}
- int probe2 = (hashValue * 37) % size;
+ int probe2 = static_cast<int>((hashValue * 37) % size);
if (pces[probe2].Retrieve(styleNumber, s, len, positions)) {
return;
}
|