summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/DefaultsAndOverrides.cpp
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/DefaultsAndOverrides.cpp
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/DefaultsAndOverrides.cpp')
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 42757693deb..40b07e13c72 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -38,7 +38,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
string value;
#ifdef ICE_OS_WINRT
- const_cast<Address&>(defaultSourceAddress) = getInvalidAddress();
+ const_cast<Address&>(defaultSourceAddress) = Address();
#else
value = properties->getProperty("Ice.Default.SourceAddress");
if(!value.empty())
@@ -53,7 +53,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
}
else
{
- const_cast<Address&>(defaultSourceAddress) = getInvalidAddress();
+ const_cast<Address&>(defaultSourceAddress) = Address();
}
#endif