diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 18:54:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 18:54:03 +0200 |
| commit | f0fbb296946f95b2bd94e86d72df618aadf3268c (patch) | |
| tree | db0a9894acd0ff3b0c4efd7ec7dc9bc2d00d56e0 /cpp/src/IceDiscovery/LocatorI.cpp | |
| parent | Fix slice/errorDetection test (diff) | |
| download | ice-f0fbb296946f95b2bd94e86d72df618aadf3268c.tar.bz2 ice-f0fbb296946f95b2bd94e86d72df618aadf3268c.tar.xz ice-f0fbb296946f95b2bd94e86d72df618aadf3268c.zip | |
Fixed ICE-7849 - Removed IceDiscovery/IceLocatorDiscovery ice_getConnection call, added IceGrid/simple C++11 test
Diffstat (limited to 'cpp/src/IceDiscovery/LocatorI.cpp')
| -rw-r--r-- | cpp/src/IceDiscovery/LocatorI.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp index 6998007fa14..99e1cdc4fa6 100644 --- a/cpp/src/IceDiscovery/LocatorI.cpp +++ b/cpp/src/IceDiscovery/LocatorI.cpp @@ -229,20 +229,20 @@ LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrxPtr& regist #ifdef ICE_CPP11_MAPPING void LocatorI::findObjectByIdAsync(Ice::Identity id, - function<void(const shared_ptr<ObjectPrx>&)> response, - function<void(exception_ptr)>, - const Ice::Current&) const + function<void(const shared_ptr<ObjectPrx>&)> response, + function<void(exception_ptr)> ex, + const Ice::Current&) const { - _lookup->findObject(response, id); + _lookup->findObject(make_pair(response, ex), id); } void LocatorI::findAdapterByIdAsync(string adapterId, - function<void(const shared_ptr<ObjectPrx>&)> response, - function<void(exception_ptr)>, - const Ice::Current&) const + function<void(const shared_ptr<ObjectPrx>&)> response, + function<void(exception_ptr)> ex, + const Ice::Current&) const { - _lookup->findAdapter(response, adapterId); + _lookup->findAdapter(make_pair(response, ex), adapterId); } #else void |