diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/src/Ice/TcpEndpointI.cpp | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'cpp/src/Ice/TcpEndpointI.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpEndpointI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index 5443b055328..e38885976fb 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -555,9 +555,9 @@ IceInternal::TcpEndpointI::hashInit() const hashAdd(h, _compress); return h; } - + vector<ConnectorPtr> -IceInternal::TcpEndpointI::connectors(const vector<struct sockaddr_storage>& addresses) const +IceInternal::TcpEndpointI::connectors(const vector<Address>& addresses) const { vector<ConnectorPtr> connectors; for(unsigned int i = 0; i < addresses.size(); ++i) |