summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/exceptions/AllTests.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-12-14 22:51:50 +0100
committerJose <jose@zeroc.com>2016-12-14 22:51:50 +0100
commit64bc7eef5fc343c33acd6264ed26330de7d2e3a5 (patch)
tree17550e0b2e3d9356b6c934154fb57e174503f146 /cpp/test/Ice/exceptions/AllTests.cpp
parentWindows test script fixes (diff)
downloadice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.bz2
ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.xz
ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.zip
WinRT -> UWP renames
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index caa960b8938..cb3d05277c0 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -501,13 +501,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
}
localOAEndpoint = ostr.str();
}
-#ifdef ICE_OS_WINRT
- bool winrt = true;
+#ifdef ICE_OS_UWP
+ bool uwp = true;
#else
- bool winrt = false;
+ bool uwp = false;
#endif
- if(!winrt || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
+ if(!uwp || (communicator->getProperties()->getProperty("Ice.Default.Protocol") != "ssl" &&
communicator->getProperties()->getProperty("Ice.Default.Protocol") != "wss"))
{
cout << "testing object adapter registration exceptions... " << flush;