Merge pull request #1821 from DARMA-tasking/1820-fix-declaration-hide…

…s-member 1820 Fix declaration hides member warnings
DARMA-tasking · May 20, 2022 · d654077 · d654077
2 parents 2dafa2f + 57d6738
commit d654077
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/unit/collection/test_lb_lite.extended.cc b/tests/unit/collection/test_lb_lite.extended.cc
@@ -105,7 +105,7 @@ static int32_t num_iter = 8;
 
 /*static*/ void LBTest::iterWork(IterMsg* msg, LBTest* col) {
   double val = 0.1f;
-  double val2 = 0.4f;
+  double val4 = 0.4f;
   auto const idx = col->getIndex().x();
   auto const iter = msg->iter_;
   int64_t const max_work = 1000 * weight;
@@ -114,10 +114,10 @@ static int32_t num_iter = 8;
   int const x = idx < 8 ? max_work : (idx > 40 ? mid_work : min_work);
   //::fmt::print("proc={}, idx={}, iter={}\n", theContext()->getNode(),idx,iter);
   for (int i = 0; i < 10000 * x; i++) {
-    val *= val2 + i*29.4;
-    val2 += 1.0;
+    val *= val4 + i*29.4;
+    val4 += 1.0;
   }
-  col->data_2 += val + val2;
+  col->data_2 += val + val4;
   if (iter == 0) {
     col->setValues();
   } else {

diff --git a/tests/unit/collection/test_mapping.cc b/tests/unit/collection/test_mapping.cc
@@ -216,9 +216,9 @@ TYPED_TEST_P(TestMapping, test_custom_mapping_1) {
 template <typename IndexT>
 struct MyDistMapper : vt::mapping::BaseMapper<IndexT> {
   static vt::ObjGroupProxyType construct() {
-    auto proxy =  vt::theObjGroup()->makeCollective<MyDistMapper<IndexT>>();
-    proxy.get()->proxy = proxy;
-    return proxy.getProxy();
+    auto prox =  vt::theObjGroup()->makeCollective<MyDistMapper<IndexT>>();
+    prox.get()->proxy = prox;
+    return prox.getProxy();
   }
 
   MyDistMapper()