diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2019-06-14 18:48:31 -0700 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2019-06-14 18:48:31 -0700 |
commit | 2625e7083ff118e8da856eb1dd04d39d2a527e22 (patch) | |
tree | 72b04289561812bf1a52d5c14cfa2e6986cd76e1 /utils/LocIpc.cpp | |
parent | 2d333ab2d898e1119576b2507fa5f1e95b90d124 (diff) | |
parent | 3bbb89aee1a89cc7d268927ac8265a70a330f2fb (diff) | |
download | gps-2625e7083ff118e8da856eb1dd04d39d2a527e22.tar.gz |
Merge 3bbb89aee1a89cc7d268927ac8265a70a330f2fb on remote branch
Change-Id: I8ce184682331aed809cdf4e36611ccd7b84c02e3
Diffstat (limited to 'utils/LocIpc.cpp')
-rw-r--r-- | utils/LocIpc.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/utils/LocIpc.cpp b/utils/LocIpc.cpp index 9496895..646d2d4 100644 --- a/utils/LocIpc.cpp +++ b/utils/LocIpc.cpp @@ -354,20 +354,11 @@ unique_ptr<LocIpcRecver> LocIpc::getLocIpcQrtrRecver(const shared_ptr<ILocIpcLis int service, int instance) { typedef unique_ptr<LocIpcRecver> (*creator_t)(const shared_ptr<ILocIpcListener>&, 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<LocIpcSender> LocIpc::getLocIpcQsockSender(int service, int instance) { - typedef shared_ptr<LocIpcSender> (*creator_t) (int, int); - static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName, - "_ZN8loc_util23createLocIpcQsockSenderEii"); - return (nullptr == creator) ? nullptr : creator(service, instance); -} -unique_ptr<LocIpcRecver> LocIpc::getLocIpcQsockRecver(const shared_ptr<ILocIpcListener>& listener, - int service, int instance) { - typedef unique_ptr<LocIpcRecver> (*creator_t)(const shared_ptr<ILocIpcListener>&, 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<LocIpcSender> LocIpc::getLocIpcInetTcpSender(const char* serverName, int32_t port) { |