Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Framework/Core/include/Framework/DataAllocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class RecordBatchWriter;

namespace o2::framework
{
class ServiceRegistry;
struct ServiceRegistry;

#define ERROR_STRING \
"data type T not supported by API, " \
Expand Down Expand Up @@ -136,7 +136,7 @@ class DataAllocator
FairMQMessagePtr headerMessage = headerMessageFromOutput(spec, channel, o2::header::gSerializationMethodROOT, 0);
return context.add<MessageContext::RootSerializedObject<T>>(std::move(headerMessage), channel, std::forward<Args>(args)...).get();
} else if constexpr (std::is_base_of_v<std::string, T>) {
std::string* s = new std::string(args...);
auto* s = new std::string(args...);
adopt(spec, s);
return *s;
} else if constexpr (std::is_base_of_v<struct TableBuilder, T>) {
Expand Down Expand Up @@ -421,7 +421,7 @@ class DataAllocator
};

template <typename ContainerT>
CacheId adoptContainer(const Output& spec, ContainerT& container, bool cache = false, o2::header::SerializationMethod method = header::gSerializationMethodNone)
CacheId adoptContainer(const Output& /*spec*/, ContainerT& /*container*/, bool /* cache = false */, o2::header::SerializationMethod /* method = header::gSerializationMethodNone*/)
{
static_assert(always_static_assert_v<ContainerT>, "Container cannot be moved. Please make sure it is backed by a FairMQMemoryResource");
return {0};
Expand Down