diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-07-12 07:25:52 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-07-12 07:25:52 -0700 |
| commit | 8aa7b01f875717abbd3983bba72b26a61b891df5 (patch) | |
| tree | e2ab36a79a094ba8d23d32a47ac0ebfdc247690d /cpp/src/Ice/Network.cpp | |
| parent | minor fixes for initgroups (diff) | |
| download | ice-8aa7b01f875717abbd3983bba72b26a61b891df5.tar.bz2 ice-8aa7b01f875717abbd3983bba72b26a61b891df5.tar.xz ice-8aa7b01f875717abbd3983bba72b26a61b891df5.zip | |
ICE-5377 - simplifying fix
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 7e76a350862..0b280166a37 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -569,18 +569,13 @@ IceUtil::Shared* IceInternal::upCast(SOCKSNetworkProxy* p) { return p; } IceInternal::SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port) { + assert(!host.empty()); memset(&_address, 0, sizeof(_address)); -#ifndef NDEBUG - _haveAddress = false; -#endif } IceInternal::SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr) { -#ifndef NDEBUG - _haveAddress = true; -#endif } void @@ -667,7 +662,7 @@ IceInternal::SOCKSNetworkProxy::resolveHost() const Address IceInternal::SOCKSNetworkProxy::getAddress() const { - assert(_haveAddress); // Host must be resolved. + assert(_host.empty()); // Host must be resolved. return _address; } |