diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-01-03 16:58:37 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-01-03 16:58:37 +0100 |
| commit | 1f29fbdbff0de80f6187f35ff8f9f0cab3cf09ad (patch) | |
| tree | 23911031865aa7da079c098f57bc8c65df68c48f /cpp/src/Ice/ConnectionFactory.cpp | |
| parent | - Fixed bug 2363, 2623, 2500 (diff) | |
| download | ice-1f29fbdbff0de80f6187f35ff8f9f0cab3cf09ad.tar.bz2 ice-1f29fbdbff0de80f6187f35ff8f9f0cab3cf09ad.tar.xz ice-1f29fbdbff0de80f6187f35ff8f9f0cab3cf09ad.zip | |
Fix for bug 1945, Sun & HP-UX compilation fixes
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 39e5a178dd0..d2d38bfc97b 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -511,7 +511,7 @@ IceInternal::OutgoingConnectionFactory::findConnection(const vector<ConnectorInf { if(q->second->endpoint() != p->endpoint) { - _connectionsByEndpoint.insert(make_pair(p->endpoint, q->second)); + _connectionsByEndpoint.insert(pair<const EndpointIPtr, ConnectionIPtr>(p->endpoint, q->second)); } if(defaultsAndOverrides->overrideCompress) @@ -734,8 +734,8 @@ IceInternal::OutgoingConnectionFactory::createConnection(const TransceiverPtr& t Ice::ConnectionIPtr connection = new ConnectionI(_instance, transceiver, ci.endpoint->compress(false), 0, ci.threadPerConnection, _instance->threadPerConnectionStackSize()); - _connections.insert(make_pair(ci, connection)); - _connectionsByEndpoint.insert(make_pair(ci.endpoint, connection)); + _connections.insert(pair<const ConnectorInfo, ConnectionIPtr>(ci, connection)); + _connectionsByEndpoint.insert(pair<const EndpointIPtr, ConnectionIPtr>(ci.endpoint, connection)); return connection; } catch(const Ice::LocalException&) |