diff --git a/utils/LocIpc.cpp b/utils/LocIpc.cpp index 94968956..646d2d4f 100644 --- a/utils/LocIpc.cpp +++ b/utils/LocIpc.cpp @@ -354,20 +354,11 @@ unique_ptr LocIpc::getLocIpcQrtrRecver(const shared_ptr (*creator_t)(const shared_ptr&, int, int); static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName, +#ifdef USE_GLIB + "_ZN8loc_util22createLocIpcQrtrRecverERKSt10shared_ptrINS_15ILocIpcListenerEEii"); +#else "_ZN8loc_util22createLocIpcQrtrRecverERKNSt3__110shared_ptrINS_15ILocIpcListenerEEEii"); - return (nullptr == creator) ? nullptr : creator(listener, service, instance); -} -shared_ptr LocIpc::getLocIpcQsockSender(int service, int instance) { - typedef shared_ptr (*creator_t) (int, int); - static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName, - "_ZN8loc_util23createLocIpcQsockSenderEii"); - return (nullptr == creator) ? nullptr : creator(service, instance); -} -unique_ptr LocIpc::getLocIpcQsockRecver(const shared_ptr& listener, - int service, int instance) { - typedef unique_ptr (*creator_t)(const shared_ptr&, int, int); - static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName, - "_ZN8loc_util23createLocIpcQsockRecverERKSt10shared_ptrINS_15ILocIpcListenerEEii"); +#endif return (nullptr == creator) ? nullptr : creator(listener, service, instance); } shared_ptr LocIpc::getLocIpcInetTcpSender(const char* serverName, int32_t port) { diff --git a/utils/LocIpc.h b/utils/LocIpc.h index c71c4e01..b91966cb 100644 --- a/utils/LocIpc.h +++ b/utils/LocIpc.h @@ -70,8 +70,6 @@ public: getLocIpcInetTcpSender(const char* serverName, int32_t port); static shared_ptr getLocIpcQrtrSender(int service, int instance); - static shared_ptr - getLocIpcQsockSender(int service, int instance); static unique_ptr getLocIpcLocalRecver(const shared_ptr& listener, @@ -82,9 +80,6 @@ public: static unique_ptr getLocIpcQrtrRecver(const shared_ptr& listener, int service, int instance); - static unique_ptr - getLocIpcQsockRecver(const shared_ptr& listener, - int service, int instance); static pair, unique_ptr> getLocIpcQmiLocServiceSenderRecverPair(const shared_ptr& listener,