summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ios/StreamEndpointI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-05-06 10:58:58 +0200
committerJose <jose@zeroc.com>2019-05-06 11:00:15 +0200
commit80565ef1ebde04d37564eced4d5ee966a92cf993 (patch)
treee4b630d3d84e7892da95b2a028e2b2117d9f9d61 /cpp/src/Ice/ios/StreamEndpointI.cpp
parentIce/hold test fixes (diff)
downloadice-80565ef1ebde04d37564eced4d5ee966a92cf993.tar.bz2
ice-80565ef1ebde04d37564eced4d5ee966a92cf993.tar.xz
ice-80565ef1ebde04d37564eced4d5ee966a92cf993.zip
Fix iOS warnings
Diffstat (limited to 'cpp/src/Ice/ios/StreamEndpointI.cpp')
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp
index f70f47d5c3b..fdce4821b21 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.cpp
+++ b/cpp/src/Ice/ios/StreamEndpointI.cpp
@@ -38,6 +38,7 @@ createIceTCP(const CommunicatorPtr& com, const string&, const StringSeq&)
}
+#if TARGET_IPHONE_SIMULATOR == 0
namespace
{
@@ -48,6 +49,7 @@ toCFString(const string& s)
}
}
+#endif
IceObjC::Instance::Instance(const Ice::CommunicatorPtr& com, Short type, const string& protocol, bool secure) :
ProtocolInstance(com, type, protocol, secure),
@@ -65,7 +67,7 @@ IceObjC::Instance::Instance(const Ice::CommunicatorPtr& com, Short type, const s
{
#if TARGET_IPHONE_SIMULATOR != 0
throw Ice::FeatureNotSupportedException(__FILE__, __LINE__, "SOCKS proxy not supported");
-#endif
+#else
_proxySettings.reset(CFDictionaryCreateMutable(0, 3, &kCFTypeDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks));
@@ -78,6 +80,7 @@ IceObjC::Instance::Instance(const Ice::CommunicatorPtr& com, Short type, const s
CFDictionarySetValue(_proxySettings.get(), kCFStreamPropertySOCKSProxyPort, port.get());
CFDictionarySetValue(_proxySettings.get(), kCFStreamPropertySOCKSVersion, kCFStreamSocketSOCKSVersion4);
+#endif
}
}