From 44c7176dd01980facba90da99fae49986265b6a0 Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:30:39 +0100 Subject: [PATCH] merge issue: SServiceId -> SServiceMethodId --- ecal/core/include/ecal/ecal_callback.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecal/core/include/ecal/ecal_callback.h b/ecal/core/include/ecal/ecal_callback.h index 2f2008b5a1..0b993c43b3 100644 --- a/ecal/core/include/ecal/ecal_callback.h +++ b/ecal/core/include/ecal/ecal_callback.h @@ -200,7 +200,7 @@ namespace eCAL * @param service_id_ The service id struct of the connection that triggered the event. * @param data_ Event callback data structure with the event specific information. **/ - using ClientEventIDCallbackT = std::function; + using ClientEventIDCallbackT = std::function; /** * @brief Server event callback function type. (deprecated) @@ -216,5 +216,5 @@ namespace eCAL * @param service_id_ The service id struct of the connection that triggered the event. * @param data_ Event callback data structure with the event specific information. **/ - using ServerEventIDCallbackT = std::function; + using ServerEventIDCallbackT = std::function; }