diff options
| author | Jose <jose@zeroc.com> | 2017-03-24 12:33:33 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-24 12:33:33 +0100 |
| commit | cdd283db257b308dd2a07171f5d2eb5e9672bc3e (patch) | |
| tree | c4791dc0c68cae3fd5e417f723d5546c8c554758 /cpp/test/Ice/interceptor/Client.cpp | |
| parent | ICE-7680: replace Thread by Runnable (diff) | |
| download | ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.tar.bz2 ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.tar.xz ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.zip | |
Fix (ICE-7498) - Port more test to UWP
Diffstat (limited to 'cpp/test/Ice/interceptor/Client.cpp')
| -rw-r--r-- | cpp/test/Ice/interceptor/Client.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp index 0e5577343aa..ec263295058 100644 --- a/cpp/test/Ice/interceptor/Client.cpp +++ b/cpp/test/Ice/interceptor/Client.cpp @@ -27,7 +27,7 @@ DEFINE_TEST("client") using namespace std; -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(ICE_OS_UWP) namespace { @@ -70,7 +70,7 @@ typedef Ice::Application App; } #endif -class Client : public App +class ClientApp : public App { public: @@ -107,8 +107,8 @@ main(int argc, char* argv[]) sigaction(SIGPIPE, &action, 0); #endif - Client app; -#if __APPLE__ + ClientApp app; +#if defined(__APPLE__) || defined(ICE_OS_UWP) int result = app._main(argc, argv); #else int result = app.main(argc, argv); @@ -127,7 +127,7 @@ main(int argc, char* argv[]) } int -Client::run(int, char*[]) +ClientApp::run(int, char*[]) { #ifndef _WIN32 @@ -186,7 +186,7 @@ Client::run(int, char*[]) int -Client::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& interceptor) +ClientApp::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& interceptor) { cout << "testing simple interceptor... " << flush; test(interceptor->getLastOperation().empty()); @@ -267,7 +267,7 @@ Client::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& interceptor) } int -Client::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& interceptor) +ClientApp::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& interceptor) { cout << "testing simple interceptor... " << flush; test(interceptor->getLastOperation().empty()); |