summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-10-21 18:58:04 +0000
committerMarc Laukien <marc@zeroc.com>2004-10-21 18:58:04 +0000
commit80d153dcde86a890fc63c147ac47dabb6af91570 (patch)
treee5eb53835dda09f97c8b04eb294792bb56b6f4e4 /cpp/src/Ice/ConnectionI.cpp
parentdemo build.xml now use Ice.jar (and db.jar if present), which is more (diff)
downloadice-80d153dcde86a890fc63c147ac47dabb6af91570.tar.bz2
ice-80d153dcde86a890fc63c147ac47dabb6af91570.tar.xz
ice-80d153dcde86a890fc63c147ac47dabb6af91570.zip
timeout for clientProxy / ice_connection
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 325db799660..fa5672e47a1 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1013,12 +1013,6 @@ Ice::ConnectionI::sendNoResponse()
}
}
-int
-Ice::ConnectionI::timeout() const
-{
- return _endpoint->timeout(); // No mutex protection necessary, _endpoint is immutable.
-}
-
EndpointPtr
Ice::ConnectionI::endpoint() const
{
@@ -1476,6 +1470,12 @@ Ice::ConnectionI::type() const
return _type; // No mutex lock, _type is immutable.
}
+Ice::Int
+Ice::ConnectionI::timeout() const
+{
+ return _endpoint->timeout(); // No mutex lock, _endpoint is immutable.
+}
+
string
Ice::ConnectionI::toString() const
{