DPL: Drop generic code to chose between unique and shared pointers

Framework/Core/CMakeLists.txt

@@ -229,7 +229,6 @@ add_executable(o2-test-framework-core
               test/test_OptionsHelpers.cxx
               test/test_OverrideLabels.cxx
               test/test_O2DataModelHelpers.cxx
-              test/test_PtrHelpers.cxx
               test/test_RootConfigParamHelpers.cxx
               test/test_Services.cxx
               test/test_StringHelpers.cxx

Framework/Core/include/Framework/TypeTraits.h

@@ -164,32 +164,5 @@ struct has_root_setowner<
     void>> : public std::true_type {
 };
 
-/// Helper class to deal with the case we are creating the first instance of a
-/// (possibly) shared resource.
-///
-/// works for both:
-///
-/// std::shared_ptr<Base> storage = make_matching<decltype(storage), Concrete1>(args...);
-///
-/// or
-///
-/// std::unique_ptr<Base> storage = make_matching<decltype(storage), Concrete1>(args...);
-///
-/// Useful to deal with those who cannot make up their mind about ownership.
-/// ;-)
-template <typename HOLDER, typename T, typename... ARGS>
-static std::enable_if_t<sizeof(std::declval<HOLDER>().unique()) != 0, HOLDER>
-  make_matching(ARGS&&... args)
-{
-  return std::make_shared<T>(std::forward<ARGS>(args)...);
-}
-
-template <typename HOLDER, typename T, typename... ARGS>
-static std::enable_if_t<sizeof(std::declval<HOLDER>().get_deleter()) != 0, HOLDER>
-  make_matching(ARGS&&... args)
-{
-  return std::make_unique<T>(std::forward<ARGS>(args)...);
-}
-
 } // namespace o2::framework
 #endif // FRAMEWORK_TYPETRAITS_H

Framework/Core/src/runDataProcessing.cxx

@@ -1098,10 +1098,7 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
     serviceRef.registerService(ServiceRegistryHelpers::handleForService<DeviceContext>(deviceContext.get()));
     serviceRef.registerService(ServiceRegistryHelpers::handleForService<DriverConfig const>(&driverConfig));
 
-    // The decltype stuff is to be able to compile with both new and old
-    // FairMQ API (one which uses a shared_ptr, the other one a unique_ptr.
-    decltype(r.fDevice) device;
-    device = make_matching<decltype(device), DataProcessingDevice>(ref, serviceRegistry, processingPolicies);
+    auto device = std::make_unique<DataProcessingDevice>(ref, serviceRegistry, processingPolicies);
 
     serviceRef.get<RawDeviceService>().setDevice(device.get());
     r.fDevice = std::move(device);