diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-08-21 11:16:15 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-08-21 11:16:15 -0230 |
| commit | 02c969e9d14684bd3aa881682aa42ff597867caf (patch) | |
| tree | bd16fc92df65d98d16584f08be9d2ff3dc632b5f /cpp/src/Ice/Network.cpp | |
| parent | ICE-5646 check return value of backtrace_symbols before processing (diff) | |
| download | ice-02c969e9d14684bd3aa881682aa42ff597867caf.tar.bz2 ice-02c969e9d14684bd3aa881682aa42ff597867caf.tar.xz ice-02c969e9d14684bd3aa881682aa42ff597867caf.zip | |
ICE-5638 add default constructor for Address union
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 06e664c8a95..3fb73573abc 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1524,19 +1524,6 @@ IceInternal::isAddressValid(const Address& addr) #endif } -Address -IceInternal::getInvalidAddress() -{ -#ifndef ICE_OS_WINRT - Address addr; - memset(&addr.saStorage, 0, sizeof(sockaddr_storage)); - addr.saStorage.ss_family = AF_UNSPEC; - return addr; -#else - return Address(); -#endif -} - #ifdef ICE_OS_WINRT vector<string> IceInternal::getHostsForEndpointExpand(const string&, ProtocolSupport, bool) @@ -2104,7 +2091,7 @@ IceInternal::getNumericAddress(const std::string& address) vector<Address> addrs = getAddresses(address, 0, EnableBoth, Ice::Ordered, false, false); if(addrs.empty()) { - return getInvalidAddress(); + return Address(); } else { @@ -2483,10 +2470,10 @@ IceInternal::createPipe(SOCKET fds[2]) { setBlock(fds[0], true); # ifndef NDEBUG - bool connected = doConnect(fds[0], addr, getInvalidAddress()); + bool connected = doConnect(fds[0], addr, Address()); assert(connected); # else - doConnect(fds[0], addr, getInvalidAddress()); + doConnect(fds[0], addr, Address()); # endif } catch(...) |