Shadow warnings on hash_table8.hpp

[zufuliu]

See ninja-build/ninja#2531, there are shadow warnings when using MSVC /W4 or GCC/Clang -Wshadow=local:

first one inside find_filled_bucket():

emhash/hash_table8.hpp

Lines 1325 to 1337 in afd962a

	const auto slot = _index[bucket].slot & _mask;
	//prefetch_heap_block((char*)&_pairs[slot]);
	if (EMH_EQHASH(bucket, key_hash)) {
	if (EMH_LIKELY(_eq(key, _pairs[slot].first)))
	return bucket;
	}
	if (next_bucket == bucket)
	return INACTIVE;
	while (true) {
	if (EMH_EQHASH(next_bucket, key_hash)) {
	const auto slot = _index[next_bucket].slot & _mask;
	if (EMH_LIKELY(_eq(key, _pairs[slot].first)))

second one inside find_filled_slot():

emhash/hash_table8.hpp

Lines 1360 to 1371 in afd962a

	const auto slot = _index[bucket].slot & _mask;
	//prefetch_heap_block((char*)&_pairs[slot]);
	if (EMH_EQHASH(bucket, key_hash)) {
	if (EMH_LIKELY(_eq(key, _pairs[slot].first)))
	return slot;
	}
	if (next_bucket == bucket)
	return _num_filled;
	while (true) {
	if (EMH_EQHASH(next_bucket, key_hash)) {
	const auto slot = _index[next_bucket].slot & _mask;

maybe the inner slot could be renamed to eslot (as in find_or_allocate()) or something else:

emhash/hash_table8.hpp

Lines 1494 to 1509 in afd962a

	const auto slot = _index[bucket].slot & _mask;
	if (EMH_EQHASH(bucket, key_hash))
	if (EMH_LIKELY(_eq(key, _pairs[slot].first)))
	return bucket;
	//check current bucket_key is in main bucket or not
	const auto kmain = hash_bucket(_pairs[slot].first);
	if (kmain != bucket)
	return kickout_bucket(kmain, bucket);
	else if (next_bucket == bucket)
	return _index[next_bucket].next = find_empty_bucket(next_bucket, 1);
	uint32_t csize = 1;
	//find next linked bucket and check key
	while (true) {
	const auto eslot = _index[next_bucket].slot & _mask;

[ktprime]

thanks, I have fixed the issues in latest version.

[zufuliu]

Thanks.