summaryrefslogtreecommitdiff
path: root/cpp/test/Common/TestHelper.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-06-04 10:35:24 +0200
committerJose <jose@zeroc.com>2018-06-04 10:35:24 +0200
commitb79fe1c6bb31ac74c938532a3ee5894c1d3d9aca (patch)
tree56259564f193b4d5579ea487dce2d90313bf3bae /cpp/test/Common/TestHelper.cpp
parentFix stacktrace test expected value (diff)
downloadice-b79fe1c6bb31ac74c938532a3ee5894c1d3d9aca.tar.bz2
ice-b79fe1c6bb31ac74c938532a3ee5894c1d3d9aca.tar.xz
ice-b79fe1c6bb31ac74c938532a3ee5894c1d3d9aca.zip
UPW build fixes
Diffstat (limited to 'cpp/test/Common/TestHelper.cpp')
-rw-r--r--cpp/test/Common/TestHelper.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/test/Common/TestHelper.cpp b/cpp/test/Common/TestHelper.cpp
index abf6e13481a..6208c83aa34 100644
--- a/cpp/test/Common/TestHelper.cpp
+++ b/cpp/test/Common/TestHelper.cpp
@@ -11,7 +11,10 @@ namespace
IceUtil::Mutex* globalMutex = 0;
Test::TestHelper* instance = 0;
+
+#ifndef ICE_OS_UWP
IceUtil::CtrlCHandler* ctrlCHandler = 0;
+#endif
class Init
{
@@ -26,11 +29,13 @@ public:
{
delete globalMutex;
globalMutex = 0;
+#ifndef ICE_OS_UWP
if(ctrlCHandler)
{
delete ctrlCHandler;
ctrlCHandler = 0;
}
+#endif
}
};
@@ -258,6 +263,7 @@ Test::TestHelper::shutdownOnInterruptCallback(int)
void
Test::TestHelper::shutdownOnInterrupt()
{
+#ifndef ICE_OS_UWP
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
assert(!ctrlCHandler);
@@ -267,4 +273,5 @@ Test::TestHelper::shutdownOnInterrupt()
}
}
ctrlCHandler->setCallback(shutdownOnInterruptCallback);
+#endif
}