From d27c9e6d69ee84410c0776910afdbbd9196b6517 Mon Sep 17 00:00:00 2001
From: Mateusz Jakub Fila <37295697+m-fila@users.noreply.github.com>
Date: Sun, 15 Dec 2024 20:58:33 +0100
Subject: [PATCH] fix temporary in emplace, implicit conversion to bool (#213)

---
 k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp    | 4 ++--
 k4MarlinWrapper/src/components/LcioEventOutput.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
index ee5f0610..19bc2462 100644
--- a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
+++ b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
@@ -177,11 +177,11 @@ StatusCode Lcio2EDM4hepTool::convertCollections(lcio::LCEventImpl* the_event) {
       // We deal with subset collections and LCRelations once we have all data
       // converted
       if (lcio_coll->isSubset()) {
-        subsetColls.emplace_back(std::make_tuple(edm4hepName, lcio_coll, lcio_coll_type_str));
+        subsetColls.emplace_back(edm4hepName, lcio_coll, lcio_coll_type_str);
         continue;
       }
       if (lcio_coll_type_str == "LCRelation") {
-        lcRelationColls.emplace_back(std::make_pair(edm4hepName, lcio_coll));
+        lcRelationColls.emplace_back(edm4hepName, lcio_coll);
       }
       if (lcio_coll_type_str == "ReconstructedParticle") {
         // Collect the ParticleID meta information because that has to go to the
diff --git a/k4MarlinWrapper/src/components/LcioEventOutput.cpp b/k4MarlinWrapper/src/components/LcioEventOutput.cpp
index e238f0c0..f5fe8b63 100644
--- a/k4MarlinWrapper/src/components/LcioEventOutput.cpp
+++ b/k4MarlinWrapper/src/components/LcioEventOutput.cpp
@@ -110,12 +110,12 @@ void LcioEventOutput::dropCollections(lcio::LCEventImpl* event, std::vector<lcio
     // don't store hit pointers if hits are dropped
     if (evt_coll_type == lcio::LCIO::TRACK && th_drop) {
       std::bitset<32> flag(evt_coll->getFlag());
-      flag[lcio::LCIO::TRBIT_HITS] = 0;
+      flag[lcio::LCIO::TRBIT_HITS] = false;
       evt_coll->setFlag(flag.to_ulong());
     }
     if (evt_coll_type == lcio::LCIO::CLUSTER && ch_drop) {
       std::bitset<32> flag(evt_coll->getFlag());
-      flag[lcio::LCIO::CLBIT_HITS] = 0;
+      flag[lcio::LCIO::CLBIT_HITS] = false;
       evt_coll->setFlag(flag.to_ulong());
     }
   }