AliceO2Group
diff --git a/‎Framework/Core/include/Framework/ServiceRegistry.h‎
Lines changed: 4 additions & 4 deletions b/‎Framework/Core/include/Framework/ServiceRegistry.h‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎Framework/Core/include/Framework/ServiceRegistryRef.h‎
Lines changed: 2 additions & 2 deletions b/‎Framework/Core/include/Framework/ServiceRegistryRef.h‎
Lines changed: 2 additions & 2 deletions
@@ -331,24 +331,24 @@ struct ServiceRegistry {
 
   /// Check if service of type T is currently active.
   template <typename T>
-  std::enable_if_t<std::is_const_v<T> == false, bool> active() const
+  std::enable_if_t<std::is_const_v<T> == false, bool> active(Salt salt) const
   {
     constexpr ServiceTypeHash typeHash{TypeIdHelpers::uniqueId<T>()};
     if (this->getPos(typeHash, GLOBAL_CONTEXT_SALT) != -1) {
       return true;
     }
-    auto result = this->getPos(typeHash, ServiceRegistry::threadSalt()) != -1;
+    auto result = this->getPos(typeHash, salt) != -1;
     return result;
   }
 
   /// Get a service for the given interface T. The returned reference exposed to
   /// the user is actually of the last concrete type C registered, however this
   /// should not be a problem.
   template <typename T>
-  T& get() const
+  T& get(Salt salt) const
   {
     constexpr ServiceTypeHash typeHash{TypeIdHelpers::uniqueId<T>()};
-    auto ptr = this->get(typeHash, ServiceRegistry::threadSalt(), ServiceKind::Serial, typeid(T).name());
+    auto ptr = this->get(typeHash, salt, ServiceKind::Serial, typeid(T).name());
     if (O2_BUILTIN_LIKELY(ptr != nullptr)) {
       if constexpr (std::is_const_v<T>) {
         return *reinterpret_cast<T const*>(ptr);
 
@@ -45,7 +45,7 @@ class ServiceRegistryRef
   template <typename T>
   std::enable_if_t<std::is_const_v<T> == false, bool> active() const
   {
-    return mRegistry.active<T>();
+    return mRegistry.active<T>(ServiceRegistry::threadSalt());
   }
 
   /// Get a service for the given interface T. The returned reference exposed to
@@ -54,7 +54,7 @@ class ServiceRegistryRef
   template <typename T>
   T& get() const
   {
-    return mRegistry.get<T>();
+    return mRegistry.get<T>(ServiceRegistry::threadSalt());
   }
 
   /// Invoke before sending messages @a parts on a channel @a channelindex
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class ServiceRegistryRef`
`45`	`45`	`template <typename T>`
`46`	`46`	`std::enable_if_t<std::is_const_v<T> == false, bool> active() const`
`47`	`47`	`{`
`48`		`- return mRegistry.active<T>();`
	`48`	`+ return mRegistry.active<T>(ServiceRegistry::threadSalt());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/// Get a service for the given interface T. The returned reference exposed to`
`@@ -54,7 +54,7 @@ class ServiceRegistryRef`
`54`	`54`	`template <typename T>`
`55`	`55`	`T& get() const`
`56`	`56`	`{`
`57`		`- return mRegistry.get<T>();`
	`57`	`+ return mRegistry.get<T>(ServiceRegistry::threadSalt());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/// Invoke before sending messages @a parts on a channel @a channelindex`