diff options
| author | Jose <jose@zeroc.com> | 2018-09-07 18:47:28 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-09-07 18:47:28 +0200 |
| commit | 8cddd264e57ab89fc4c6952b2b390457a4bfbedf (patch) | |
| tree | 66bb34aa13289ed0017a9460e800740516bb1278 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Enable test workers for PHP, Ruby and Python (diff) | |
| download | ice-8cddd264e57ab89fc4c6952b2b390457a4bfbedf.tar.bz2 ice-8cddd264e57ab89fc4c6952b2b390457a4bfbedf.tar.xz ice-8cddd264e57ab89fc4c6952b2b390457a4bfbedf.zip | |
Fixes for C++17 mode
Close #180
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 283832c4ea9..f93a028d68a 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -1422,8 +1422,16 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator { EndpointSeq endpts = proxy ? proxy->ice_getEndpoints() : EndpointSeq(); ostringstream o; +#ifdef ICE_CPP11_COMPILER + transform(endpts.begin(), endpts.end(), ostream_iterator<string>(o, endpts.size() > 1 ? ":" : ""), + [](const EndpointPtr& endpoint) + { + return endpoint->toString(); + }); +#else transform(endpts.begin(), endpts.end(), ostream_iterator<string>(o, endpts.size() > 1 ? ":" : ""), Ice::constMemFun(&Endpoint::toString)); +#endif out << o.str(); } } |