From 5408582fdcd3aea4ca16337154eb98de2bf05359 Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Sun, 8 Sep 2024 16:58:37 +0200
Subject: [PATCH] Fix a few more shadowing warnings

---
 k4EDM4hep2LcioConv/src/k4Lcio2EDM4hepConv.cpp | 10 +++++-----
 tests/src/ComparisonUtils.h                   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/k4EDM4hep2LcioConv/src/k4Lcio2EDM4hepConv.cpp b/k4EDM4hep2LcioConv/src/k4Lcio2EDM4hepConv.cpp
index 18e91a8..365af62 100644
--- a/k4EDM4hep2LcioConv/src/k4Lcio2EDM4hepConv.cpp
+++ b/k4EDM4hep2LcioConv/src/k4Lcio2EDM4hepConv.cpp
@@ -70,14 +70,14 @@ podio::Frame convertEvent(EVENT::LCEvent* evt, const std::vector<std::pair<std::
   const auto collNames = [&collsToConvert, &evt]() {
     if (collsToConvert.empty()) {
       const auto evtColls = evt->getCollectionNames();
-      std::vector<std::pair<std::string, std::string>> collNames{};
-      collNames.reserve(evtColls->size());
+      std::vector<std::pair<std::string, std::string>> resCollNames{};
+      resCollNames.reserve(evtColls->size());
       for (const auto& name : *evtColls) {
-        collNames.emplace_back(name, name);
+        resCollNames.emplace_back(name, name);
       }
-      return collNames;
+      return resCollNames;
     }
-    return std::move(collsToConvert);
+    return collsToConvert;
   }();
 
   // In this loop the data gets converted.
diff --git a/tests/src/ComparisonUtils.h b/tests/src/ComparisonUtils.h
index 26cb242..887a45b 100644
--- a/tests/src/ComparisonUtils.h
+++ b/tests/src/ComparisonUtils.h
@@ -84,9 +84,9 @@ bool compareValuesNanSafe(LCIO lcioV, EDM4hepT edm4hepV, const std::string& msg)
               >;
 
   if constexpr (isVectorLike) {
-    const auto vecSize = [](EDM4hepT& edm4hepV) -> std::size_t {
+    const auto vecSize = [](EDM4hepT& edm4hepVal) -> std::size_t {
       if constexpr (has_size_method<EDM4hepT>::value) {
-        return edm4hepV.size();
+        return edm4hepVal.size();
       } else if constexpr (std::is_same_v<EDM4hepT, edm4hep::Vector3f> || std::is_same_v<EDM4hepT, edm4hep::Vector3d>) {
         return 3u;
       } else if constexpr (std::is_same_v<EDM4hepT, edm4hep::Vector2i> || std::is_same_v<EDM4hepT, edm4hep::Vector2f>) {