diff options
| author | nyamatongwe <unknown> | 2011-07-11 11:17:48 +1000 | 
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-07-11 11:17:48 +1000 | 
| commit | 0cf1225ab37cfb1426f47018c0c1e9e615ee1eef (patch) | |
| tree | 59e341c45ce2e1fe6ef113dab72004b30895ddfc /src/PositionCache.cxx | |
| parent | ebe47b5ef1aeb3d971b2166b9c3eae2f6fd25447 (diff) | |
| download | scintilla-mirror-0cf1225ab37cfb1426f47018c0c1e9e615ee1eef.tar.gz | |
Avoid shadowing of fields even for static methods to stop warnings.
Diffstat (limited to 'src/PositionCache.cxx')
| -rw-r--r-- | src/PositionCache.cxx | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 8a195caac..2105c292f 100644 --- a/src/PositionCache.cxx +++ b/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;  }  | 
