diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-07-01 16:37:15 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-07-01 16:37:15 +0200 |
| commit | d00984e18ba41dbf3447f69ea0568eb1ac24ccb8 (patch) | |
| tree | 002d720d949af1cf04aa40520cfe791f320b4363 /cpp/src | |
| parent | Fix for 6626: Java -> C++/C# SSL issue on Windows (diff) | |
| parent | Force correct overload selection to fix compatibility with Intel C++ 2015 (diff) | |
| download | ice-d00984e18ba41dbf3447f69ea0568eb1ac24ccb8.tar.bz2 ice-d00984e18ba41dbf3447f69ea0568eb1ac24ccb8.tar.xz ice-d00984e18ba41dbf3447f69ea0568eb1ac24ccb8.zip | |
Merge pull request #3 from alexmnazarenko/master
Force correct overload selection to fix compatibility with Intel C++ 2015
Diffstat (limited to 'cpp/src')
| -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 5bbfd7e27f6..1a310622564 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, new Callback(self, callback)); + _locatorInfo->getEndpoints(self, _locatorCacheTimeout, LocatorInfo::GetEndpointsCallbackPtr(new Callback(self, callback))); } else { |