summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-02-13 16:53:24 +0100
committerJose <jose@zeroc.com>2018-02-13 16:53:24 +0100
commit0561be2a1239c24fffd2b6fc45c146efd4a495c0 (patch)
treed6e90c505081c8465c20566fa8ee14038ce3ee1b /cpp/src/Ice/Instance.cpp
parentFix ICE-8665 - PHP timeout test failure (diff)
downloadice-0561be2a1239c24fffd2b6fc45c146efd4a495c0.tar.bz2
ice-0561be2a1239c24fffd2b6fc45c146efd4a495c0.tar.xz
ice-0561be2a1239c24fffd2b6fc45c146efd4a495c0.zip
Fix ICE-8201 - Add support for per-thread context to UWP
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 35b8a7bbc28..6213c8f91aa 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1207,10 +1207,9 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
//
// Client ACM enabled by default. Server ACM disabled by default.
//
-#ifndef ICE_OS_UWP
const_cast<ImplicitContextIPtr&>(_implicitContext) =
ImplicitContextI::create(_initData.properties->getProperty("Ice.ImplicitContext"));
-#endif
+
_routerManager = new RouterManager;
_locatorManager = new LocatorManager(_initData.properties);