summaryrefslogtreecommitdiffstats
path: root/scintilla/src/PositionCache.cxx
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@users.sourceforge.net>2011-07-12 14:45:31 +0000
committerXhmikosR <xhmikosr@users.sourceforge.net>2011-07-12 14:45:31 +0000
commit4ec5dfaa408ca6bc08615b7112f9c2ed00e7a271 (patch)
tree7379ce5df521391aa2415b2a99151e255766a94e /scintilla/src/PositionCache.cxx
parent61c639e3dbb9070523e09c58e4cd7b4b5bf974c1 (diff)
downloadnotepad2-mod-4ec5dfaa408ca6bc08615b7112f9c2ed00e7a271.zip
notepad2-mod-4ec5dfaa408ca6bc08615b7112f9c2ed00e7a271.tar.gz
notepad2-mod-4ec5dfaa408ca6bc08615b7112f9c2ed00e7a271.tar.bz2
update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@555 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src/PositionCache.cxx')
-rw-r--r--scintilla/src/PositionCache.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
index 50d964d..bc0d353 100644
--- a/scintilla/src/PositionCache.cxx
+++ b/scintilla/src/PositionCache.cxx
@@ -542,16 +542,16 @@ bool PositionCacheEntry::Retrieve(unsigned int styleNumber_, const char *s_,
}
}
-int PositionCacheEntry::Hash(unsigned int styleNumber, const char *s, unsigned int len) {
+int PositionCacheEntry::Hash(unsigned int styleNumber_, const char *s, unsigned int len_) {
unsigned int ret = s[0] << 7;
- for (unsigned int i=0; i<len; i++) {
+ for (unsigned int i=0; i<len_; i++) {
ret *= 1000003;
ret ^= s[i];
}
ret *= 1000003;
- ret ^= len;
+ ret ^= len_;
ret *= 1000003;
- ret ^= styleNumber;
+ ret ^= styleNumber_;
return ret;
}