4 files changed, 8 insertions, 5 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 52b6c00d380..e70e9888832 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -29,8 +29,8 @@ compress = 1
 # thread per connection mode.
 #
 
-#threadPerConnection = 0
-threadPerConnection = 1
+threadPerConnection = 0
+#threadPerConnection = 1
 
 #
 # If you don't set "host" below, then the Ice library will try to find
diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp
index ceb94cafd77..984b1d5d3e2 100644
--- a/cpp/src/FreezeScript/Data.cpp
+++ b/cpp/src/FreezeScript/Data.cpp
@@ -1600,7 +1600,7 @@ FreezeScript::SequenceData::getElement(const DataPtr& element) const
     }
 
     Ice::Long iv = i->integerValue();
-    if(iv < 0 || iv >= _elements.size())
+    if(iv < 0 || iv >= static_cast<Ice::Long>(_elements.size()))
     {
         _errorReporter->error("sequence index " + i->toString() + " out of range");
     }
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index b5d5d880bc4..43c76a93dde 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -321,14 +321,15 @@ IceInternal::TcpTransceiver::type() const
 string
 IceInternal::TcpTransceiver::toString() const
 {
-    return fdToString(_fd);
+    return _desc;
 }
 
 IceInternal::TcpTransceiver::TcpTransceiver(const InstancePtr& instance, SOCKET fd) :
     _traceLevels(instance->traceLevels()),
     _logger(instance->logger()),
     _stats(instance->stats()),
-    _fd(fd)
+    _fd(fd),
+    _desc(fdToString(fd))
 {
     FD_ZERO(&_rFdSet);
     FD_ZERO(&_wFdSet);
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index 2a75c63cd47..cfefc3daf73 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -49,6 +49,8 @@ private:
     SOCKET _fd;
     fd_set _rFdSet;
     fd_set _wFdSet;
+
+    const std::string _desc;
 };
 
 }