summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/Instance.h
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2013-04-04 16:02:42 -0700
committerMark Spruiell <mes@zeroc.com>2013-04-04 16:02:42 -0700
commit9cb665138c7d2422739e32b40a249c64fd3b6cd5 (patch)
tree94759d916599ca08761b98580185a230744ac67a /cpp/src/IceSSL/Instance.h
parentx64 VC10 icexml35d.dll was linked to wrong file (diff)
downloadice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.bz2
ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.xz
ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.zip
* SOCKS support for C++
* Minor cleanup in C# * Unity fixes
Diffstat (limited to 'cpp/src/IceSSL/Instance.h')
-rw-r--r--cpp/src/IceSSL/Instance.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index eacad08d549..ff63c33b951 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -40,6 +40,7 @@ public:
IceInternal::EndpointHostResolverPtr endpointHostResolver() const;
IceInternal::ProtocolSupport protocolSupport() const;
bool preferIPv6() const;
+ IceInternal::NetworkProxyPtr networkProxy() const;
std::string defaultHost() const;
Ice::EncodingVersion defaultEncoding() const;
int networkTraceLevel() const;