diff --git a/k4FWCore/include/k4FWCore/DataWrapper.h b/k4FWCore/include/k4FWCore/DataWrapper.h index 005f411d..1cd4691d 100644 --- a/k4FWCore/include/k4FWCore/DataWrapper.h +++ b/k4FWCore/include/k4FWCore/DataWrapper.h @@ -41,7 +41,7 @@ template class GAUDI_API DataWrapper : public DataWrapperBase { template friend class DataHandle; public: - DataWrapper() : m_data(nullptr) {}; + DataWrapper() : m_data(nullptr){} DataWrapper(T&& coll) { m_data = new T(std::move(coll)); is_owner = true; @@ -49,7 +49,7 @@ template class GAUDI_API DataWrapper : public DataWrapperBase { DataWrapper(std::unique_ptr uptr) : m_data(uptr.get()) { uptr.release(); is_owner = false; - }; + } virtual ~DataWrapper(); const T* getData() const { return m_data; } diff --git a/k4FWCore/include/k4FWCore/FunctionalUtils.h b/k4FWCore/include/k4FWCore/FunctionalUtils.h index c795d6c7..49f35f4d 100644 --- a/k4FWCore/include/k4FWCore/FunctionalUtils.h +++ b/k4FWCore/include/k4FWCore/FunctionalUtils.h @@ -48,7 +48,6 @@ namespace k4FWCore { }; using EventStoreType_t = typename EventStoreType::type; - template requires(!std::is_same_v) const auto& maybeTransformToEDM4hep(const P& arg) { @@ -92,8 +91,8 @@ namespace k4FWCore { // returned from the algorithm if constexpr (std::same_as) { return std::unique_ptr(std::forward(arg)); - // Most common case, when an algorithm returns a collection and - // we want to store a unique_ptr + // Most common case, when an algorithm returns a collection and + // we want to store a unique_ptr } else { return std::make_unique(std::forward(arg)); }