diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-08-08 13:33:18 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-08-08 13:33:18 -0230 |
| commit | c540f34ba2dd245e88cee99f39552efbd44c91e1 (patch) | |
| tree | a637ce6dce7ad189069e784f21d5166c6a98aff1 /cpp/src/Ice/ProtocolInstance.cpp | |
| parent | Fixed (ICE-5583) - Consider adding IceSSL.CertAuthFile to C# implementation (diff) | |
| download | ice-c540f34ba2dd245e88cee99f39552efbd44c91e1.tar.bz2 ice-c540f34ba2dd245e88cee99f39552efbd44c91e1.tar.xz ice-c540f34ba2dd245e88cee99f39552efbd44c91e1.zip | |
ICE-5596 add Ice.Default.Timeout property
Diffstat (limited to 'cpp/src/Ice/ProtocolInstance.cpp')
| -rw-r--r-- | cpp/src/Ice/ProtocolInstance.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp index b643a0c7020..363de0cb1b0 100644 --- a/cpp/src/Ice/ProtocolInstance.cpp +++ b/cpp/src/Ice/ProtocolInstance.cpp @@ -72,6 +72,13 @@ IceInternal::ProtocolInstance::defaultEncoding() const return _instance->defaultsAndOverrides()->defaultEncoding; } +int +IceInternal::ProtocolInstance::defaultTimeout() const +{ + return _instance->defaultsAndOverrides()->defaultTimeout; +} + + NetworkProxyPtr IceInternal::ProtocolInstance::networkProxy() const { |