diff options
| author | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
| commit | b9c2a6f6628476f11c78a7de2adc90edca1e209e (patch) | |
| tree | df192d87dfbc594a7a2b52a96b5145ad3156d26f /cpp/src/Ice/Reference.cpp | |
| parent | ICE-6645 Removed hack to keep binary compatibility in Ice 3.6.1 (diff) | |
| parent | Removed ARM configuraton from WinRT testsuite solutions (diff) | |
| download | ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.bz2 ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.xz ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 1a310622564..c461535c33e 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1669,7 +1669,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal if(_locatorInfo) { RoutableReference* self = const_cast<RoutableReference*>(this); - _locatorInfo->getEndpoints(self, _locatorCacheTimeout, LocatorInfo::GetEndpointsCallbackPtr(new Callback(self, callback))); + _locatorInfo->getEndpointsWithCallback(self, _locatorCacheTimeout, new Callback(self, callback)); } else { |