MB-67589: Fix MSVC warning C4459 [6/6]...

Fix the remaining issues where local variables hides global ones

Change-Id: I9c2809e3ea785684523e11037b451e610b6c3cf0
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/236005
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Jim Walker <jim@couchbase.com>

Author: trondn

engines/ep/benchmarks/probabilistic_counter_bench.cc

@@ -28,12 +28,13 @@
 static const double incFactor = 0.012;
 
 ProbabilisticCounter<uint8_t> probabilisticCounter(incFactor);
-uint8_t counter{100}; // 100 is an arbitrary value between 0 and 255
+uint8_t benchmarkCounter{100}; // 100 is an arbitrary value between 0 and 255
 
 static void BM_SaturateCounter(benchmark::State& state) {
     while (state.KeepRunning()) {
         // benchmark generateValue
-        benchmark::DoNotOptimize(probabilisticCounter.generateValue(counter));
+        benchmark::DoNotOptimize(
+                probabilisticCounter.generateValue(benchmarkCounter));
     }
 }
 

engines/ep/src/ep_parameters.cc

@@ -181,12 +181,12 @@ static const std::unordered_set<std::string_view> vbucketParamSet{
 };
 
 static const std::unordered_set<std::string_view> allParamSet = []() {
-    std::unordered_set<std::string_view> allParamSet;
-    allParamSet.insert(checkpointParamSet.begin(), checkpointParamSet.end());
-    allParamSet.insert(flushParamSet.begin(), flushParamSet.end());
-    allParamSet.insert(dcpParamSet.begin(), dcpParamSet.end());
-    allParamSet.insert(vbucketParamSet.begin(), vbucketParamSet.end());
-    return allParamSet;
+    std::unordered_set<std::string_view> ret;
+    ret.insert(checkpointParamSet.begin(), checkpointParamSet.end());
+    ret.insert(flushParamSet.begin(), flushParamSet.end());
+    ret.insert(dcpParamSet.begin(), dcpParamSet.end());
+    ret.insert(vbucketParamSet.begin(), vbucketParamSet.end());
+    return ret;
 }();
 
 bool checkSetParameterCategory(std::string_view key,