From b79fe1c6bb31ac74c938532a3ee5894c1d3d9aca Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 4 Jun 2018 10:35:24 +0200 Subject: UPW build fixes --- cpp/test/Common/TestHelper.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cpp/test/Common/TestHelper.cpp') 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 lock(globalMutex); assert(!ctrlCHandler); @@ -267,4 +273,5 @@ Test::TestHelper::shutdownOnInterrupt() } } ctrlCHandler->setCallback(shutdownOnInterruptCallback); +#endif } -- cgit v1.2.3