diff options
Diffstat (limited to 'cpp/src/Ice/TcpConnector.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpConnector.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp index af7b7763f1e..b91a83ec732 100644 --- a/cpp/src/Ice/TcpConnector.cpp +++ b/cpp/src/Ice/TcpConnector.cpp @@ -24,26 +24,22 @@ using namespace IceInternal; TransceiverPtr IceInternal::TcpConnector::connect(int timeout) { -#ifndef ICE_NO_TRACE if (_traceLevels->network >= 2) { ostringstream s; s << "trying to establish tcp connection to " << toString(); _logger->trace(_traceLevels->networkCat, s.str()); } -#endif int fd = createSocket(false); doConnect(fd, _addr, timeout); -#ifndef ICE_NO_TRACE if (_traceLevels->network >= 1) { ostringstream s; s << "tcp connection established\n" << fdToString(fd); _logger->trace(_traceLevels->networkCat, s.str()); } -#endif return new TcpTransceiver(_instance, fd); } @@ -55,13 +51,10 @@ IceInternal::TcpConnector::toString() const } IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const string& host, int port) : - _instance(instance) + _instance(instance), + _traceLevels(instance->traceLevels()), + _logger(instance->logger()) { -#ifndef ICE_NO_TRACE - _traceLevels = _instance->traceLevels(); - _logger = _instance->logger(); -#endif - getAddress(host.c_str(), port, _addr); } |