From afded701cfe4c7d64037f1b2d0b542a75fd81055 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Mon, 31 Oct 2022 09:38:23 +0100
Subject: [PATCH] Release some code exclusions for gcc < 10
---
DDDigi/src/DigiData.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/DDDigi/src/DigiData.cpp b/DDDigi/src/DigiData.cpp
index d579ad29f..264817542 100644
--- a/DDDigi/src/DigiData.cpp
+++ b/DDDigi/src/DigiData.cpp
@@ -270,16 +270,12 @@ DataSegment::DataSegment(std::mutex& l, int i) : lock(l), id(i)
/// Remove data item from segment
bool DataSegment::emplace(Key key, std::any&& item) {
std::lock_guard<std::mutex> l(lock);
-#if defined(__GNUC__) && (__GNUC__ < 10)
- /// Lower compiler version have a bad implementation of std::any
- bool ret = false;
-#else
+ bool has_value = item.has_value();
bool ret = data.emplace(key, std::move(item)).second;
-#endif
if ( !ret ) {
Key k(key);
except("DataSegment","Error in DataSegment map. Duplicate ID: mask:%04X Number:%d Value:%s",
- k.mask(), k.item(), yes_no(item.has_value()));
+ k.mask(), k.item(), yes_no(has_value));
}
return ret;
}
--
GitLab