diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-04-04 16:02:42 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-04-04 16:02:42 -0700 |
| commit | 9cb665138c7d2422739e32b40a249c64fd3b6cd5 (patch) | |
| tree | 94759d916599ca08761b98580185a230744ac67a /cpp/src/Ice/Instance.h | |
| parent | x64 VC10 icexml35d.dll was linked to wrong file (diff) | |
| download | ice-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/Ice/Instance.h')
| -rw-r--r-- | cpp/src/Ice/Instance.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 0437f4d10ab..d092e49dc3d 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -34,6 +34,7 @@ #include <Ice/RetryQueueF.h> #include <Ice/DynamicLibraryF.h> #include <Ice/PluginF.h> +#include <Ice/NetworkF.h> #include <Ice/Initialize.h> #include <Ice/ImplicitContextI.h> #include <Ice/FacetMap.h> @@ -73,6 +74,7 @@ public: ObjectAdapterFactoryPtr objectAdapterFactory() const; ProtocolSupport protocolSupport() const; bool preferIPv6() const; + NetworkProxyPtr networkProxy() const; ThreadPoolPtr clientThreadPool(); ThreadPoolPtr serverThreadPool(bool create = true); EndpointHostResolverPtr endpointHostResolver(); @@ -136,6 +138,7 @@ private: ObjectAdapterFactoryPtr _objectAdapterFactory; ProtocolSupport _protocolSupport; bool _preferIPv6; + NetworkProxyPtr _networkProxy; ThreadPoolPtr _clientThreadPool; ThreadPoolPtr _serverThreadPool; EndpointHostResolverPtr _endpointHostResolver; |