summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Network.h
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2014-08-21 11:16:15 -0230
committerDwayne Boone <dwayne@zeroc.com>2014-08-21 11:16:15 -0230
commit02c969e9d14684bd3aa881682aa42ff597867caf (patch)
treebd16fc92df65d98d16584f08be9d2ff3dc632b5f /cpp/src/Ice/Network.h
parentICE-5646 check return value of backtrace_symbols before processing (diff)
downloadice-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.h')
-rw-r--r--cpp/src/Ice/Network.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index a9dd19ded04..c0130e6d96f 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -121,6 +121,12 @@ struct ICE_API Address
#else
union Address
{
+ Address()
+ {
+ memset(&saStorage, 0, sizeof(sockaddr_storage));
+ saStorage.ss_family = AF_UNSPEC;
+ }
+
sockaddr sa;
sockaddr_in saIn;
sockaddr_in6 saIn6;
@@ -288,7 +294,6 @@ ICE_API void fdToAddressAndPort(SOCKET, std::string&, int&, std::string&, int&);
ICE_API void addrToAddressAndPort(const Address&, std::string&, int&);
ICE_API std::string addressesToString(const Address&, const Address&, bool);
ICE_API bool isAddressValid(const Address&);
-ICE_API Address getInvalidAddress();
ICE_API std::vector<std::string> getHostsForEndpointExpand(const std::string&, ProtocolSupport, bool);