diff options
| author | Jose <jose@zeroc.com> | 2016-12-14 22:51:50 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-12-14 22:51:50 +0100 |
| commit | 64bc7eef5fc343c33acd6264ed26330de7d2e3a5 (patch) | |
| tree | 17550e0b2e3d9356b6c934154fb57e174503f146 /cpp | |
| parent | Windows test script fixes (diff) | |
| download | ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.bz2 ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.tar.xz ice-64bc7eef5fc343c33acd6264ed26330de7d2e3a5.zip | |
WinRT -> UWP renames
Diffstat (limited to 'cpp')
93 files changed, 390 insertions, 390 deletions
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h index c5acf6bd16e..70143b7a8e2 100644 --- a/cpp/include/Glacier2/Glacier2.h +++ b/cpp/include/Glacier2/Glacier2.h @@ -16,7 +16,7 @@ #include <Glacier2/Session.h> #include <Glacier2/PermissionsVerifier.h> #include <Glacier2/Metrics.h> -#if (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) && !defined(ICE_OS_WINRT) +#if (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) && !defined(ICE_OS_UWP) # include <Glacier2/Application.h> #endif #include <Glacier2/SessionHelper.h> diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index c6672061f1d..eec473a0ddb 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -22,7 +22,7 @@ #include <vector> #include <map> -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP # if defined(_WIN32) # include <process.h> # else diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index c5788002ec5..9a26eb96a3b 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -32,7 +32,7 @@ #include <Ice/OutgoingAsync.h> #include <Ice/IncomingAsync.h> #include <Ice/Process.h> -#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) +#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) # include <Ice/Application.h> #endif #include <Ice/Connection.h> @@ -47,7 +47,7 @@ #include <Ice/Instrumentation.h> #include <Ice/Metrics.h> #include <Ice/SliceChecksums.h> -#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) +#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) # include <Ice/Service.h> #endif #include <Ice/RegisterPlugins.h> diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h index 8e7cc50b1e6..4cbbead9c1e 100644 --- a/cpp/include/IceSSL/Config.h +++ b/cpp/include/IceSSL/Config.h @@ -31,7 +31,7 @@ # define ICE_USE_SECURE_TRANSPORT_MACOS 1 #endif #elif defined(_WIN32) -# if !defined(ICE_OS_WINRT) +# if !defined(ICE_OS_UWP) # define ICE_USE_SCHANNEL 1 # endif #else diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index 8dd6fa24d8b..82143cb4ac9 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -25,7 +25,7 @@ // For struct sockaddr_storage #ifdef _WIN32 -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP # include <winsock2.h> #endif #else @@ -72,7 +72,7 @@ typedef SecKeyRef KeyRef; typedef CERT_SIGNED_CONTENT_INFO* X509CertificateRef; typedef CERT_PUBLIC_KEY_INFO* KeyRef; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) typedef Windows::Security::Cryptography::Certificates::Certificate^ X509CertificateRef; typedef Windows::Security::Cryptography::Core::CryptographicKey^ KeyRef; diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 94c31eeff25..0b8173e2b0b 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -142,11 +142,11 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1900) // -// Check if building for WinRT +// Check if building for UWP // # include <winapifamily.h> # if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -# define ICE_OS_WINRT +# define ICE_OS_UWP # define ICE_STATIC_LIBS # endif @@ -278,13 +278,13 @@ # ifdef ICE_CPP11_MAPPING # if defined(_DEBUG) -# if defined(ICE_OS_WINRT) +# if defined(ICE_OS_UWP) # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11D.lib" # else # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D.lib" # endif # else -# if defined(ICE_OS_WINRT) +# if defined(ICE_OS_UWP) # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11.lib" # else # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11.lib" @@ -292,13 +292,13 @@ # endif # else # if defined(_DEBUG) -# if defined(ICE_OS_WINRT) +# if defined(ICE_OS_UWP) # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwpD.lib" # else # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D.lib" # endif # else -# if defined(ICE_OS_WINRT) +# if defined(ICE_OS_UWP) # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp.lib" # else # define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ".lib" diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index d943aa3f9df..86a57adb7a5 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -90,7 +90,7 @@ ICE_API FILE* fopen(const std::string&, const std::string&); ICE_API FILE* freopen(const std::string&, const std::string&, FILE*); ICE_API int open(const std::string&, int); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP ICE_API int getcwd(std::string&); #endif diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h index 1f9f4b56313..b338dcc2e4f 100644 --- a/cpp/include/IceUtil/IceUtil.h +++ b/cpp/include/IceUtil/IceUtil.h @@ -19,7 +19,7 @@ #include <IceUtil/Config.h> #include <IceUtil/Cond.h> -#if !defined(__APPLE__) && !defined(ICE_OS_WINRT) +#if !defined(__APPLE__) && !defined(ICE_OS_UWP) # include <IceUtil/CtrlCHandler.h> #endif #include <IceUtil/Exception.h> diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h index 9b88540bcee..5e8d04bef94 100644 --- a/cpp/include/IceUtil/Mutex.h +++ b/cpp/include/IceUtil/Mutex.h @@ -141,7 +141,7 @@ Mutex::Mutex(MutexProtocol protocol) inline void Mutex::init(MutexProtocol) { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP InitializeCriticalSectionEx(&_mutex, 0, 0); #else InitializeCriticalSection(&_mutex); diff --git a/cpp/include/IceUtil/SHA1.h b/cpp/include/IceUtil/SHA1.h index 32b64406870..d3ec7e48499 100644 --- a/cpp/include/IceUtil/SHA1.h +++ b/cpp/include/IceUtil/SHA1.h @@ -21,7 +21,7 @@ namespace IceUtilInternal ICE_API void sha1(const unsigned char*, std::size_t, std::vector<unsigned char>&); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP class ICE_API SHA1 { public: diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index f1dd851aa84..2431038a53e 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -15,7 +15,7 @@ #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP # include <memory> # include <thread> #endif @@ -35,7 +35,7 @@ public: // ThreadControl(); -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP ThreadControl(const std::shared_ptr<std::thread>&); #elif defined(_WIN32) ThreadControl(HANDLE, DWORD); @@ -80,7 +80,7 @@ public: // id() returns the Thread ID on Windows and the underlying pthread_t // on POSIX platforms. // -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP typedef std::thread::id ID; #elif defined(_WIN32) typedef DWORD ID; @@ -94,7 +94,7 @@ public: private: -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP std::shared_ptr<std::thread> _thread; std::thread::id _id; #elif defined(_WIN32) @@ -152,7 +152,7 @@ protected: bool _started; bool _running; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP std::shared_ptr<std::thread> _thread; #elif defined(_WIN32) HANDLE _handle; diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 5a6c9354ae1..074f4d7a6ae 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -1185,7 +1185,7 @@ Glacier2::SessionFactoryHelper::createInitData() initData.properties->setProperty("Ice.Default.Router", createProxyStr(_identity)); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP // // If using a secure connection setup the IceSSL plug-in, if IceSSL // plug-in has already been setup we don't want to override the diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h index 269c8963226..fc5d06cc0ad 100644 --- a/cpp/src/Ice/Acceptor.h +++ b/cpp/src/Ice/Acceptor.h @@ -27,7 +27,7 @@ public: virtual NativeInfoPtr getNativeInfo() = 0; virtual void close() = 0; virtual EndpointIPtr listen() = 0; -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual void startAccept() = 0; virtual void finishAccept() = 0; #endif diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 87f6edee197..0aaa3b09bc1 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1274,7 +1274,7 @@ IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const Communicat } } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool IceInternal::IncomingConnectionFactory::startAsync(SocketOperation) { @@ -1797,7 +1797,7 @@ IceInternal::IncomingConnectionFactory::closeAcceptor() #if TARGET_OS_IPHONE != 0 // // Only clear the acceptor on iOS where it can be destroyed/re-created during the lifetime of the incoming - // connection factory. On other platforms, we keep it set. This is in particular import for IOCP/WinRT where + // connection factory. On other platforms, we keep it set. This is in particular import for IOCP/UWP where // finishAsync can be called after the acceptor is closed. // _acceptor = 0; diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index f0c6ed69021..1fadf0c2b66 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -199,7 +199,7 @@ public: // Operations from EventHandler // -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual bool startAsync(SocketOperation); virtual bool finishAsync(SocketOperation); #endif diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 9e2c6042043..7845259855c 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -271,7 +271,7 @@ Ice::ConnectionI::OutgoingMessage::sent() if(outAsync) { -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) invokeSent = outAsync->sent(); return invokeSent || receivedReply; #else @@ -1197,7 +1197,7 @@ Ice::ConnectionI::createProxy(const Identity& ident) const _instance->referenceFactory()->create(ident, ICE_SHARED_FROM_CONST_THIS(ConnectionI))); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool Ice::ConnectionI::startAsync(SocketOperation operation) { @@ -1599,7 +1599,7 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess { for(vector<OutgoingMessage>::const_iterator p = sentCBs.begin(); p != sentCBs.end(); ++p) { -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) if(p->invokeSent) { p->outAsync->invokeSent(); @@ -1797,7 +1797,7 @@ Ice::ConnectionI::finish(bool close) OutgoingMessage* message = &_sendStreams.front(); _writeStream.swap(*message->stream); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) // // The current message might be sent but not yet removed from _sendStreams. If // the response has been received in the meantime, we remove the message from @@ -3107,7 +3107,7 @@ Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& request stream.swap(*outAsync->getIs()); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) // // If we just received the reply of a request which isn't acknowledge as // sent yet, we queue the reply instead of processing it right away. It diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 6c0f49f6c08..6bd7437c436 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -43,7 +43,7 @@ #include <deque> -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) # ifndef ICE_HAS_BZIP2 # define ICE_HAS_BZIP2 # endif @@ -94,7 +94,7 @@ public: { OutgoingMessage(Ice::OutputStream* str, bool comp) : stream(str), compress(comp), requestId(0), adopted(false) -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) , isSent(false), invokeSent(false), receivedReply(false) #endif { @@ -103,7 +103,7 @@ public: OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, Ice::OutputStream* str, bool comp, int rid) : stream(str), outAsync(o), compress(comp), requestId(rid), adopted(false) -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) , isSent(false), invokeSent(false), receivedReply(false) #endif { @@ -119,7 +119,7 @@ public: bool compress; int requestId; bool adopted; -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool isSent; bool invokeSent; bool receivedReply; @@ -216,7 +216,7 @@ public: // // Operations from EventHandler // -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startAsync(IceInternal::SocketOperation); bool finishAsync(IceInternal::SocketOperation); #endif diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp index eb0422ba7e9..565a2cc2e1d 100644 --- a/cpp/src/Ice/CountDownLatch.cpp +++ b/cpp/src/Ice/CountDownLatch.cpp @@ -19,7 +19,7 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) : } #ifdef _WIN32 -# ifndef ICE_OS_WINRT +# ifndef ICE_OS_UWP _event = CreateEvent(0, TRUE, FALSE, 0); # else _event = CreateEventExW(0, 0, CREATE_EVENT_MANUAL_RESET, SEMAPHORE_ALL_ACCESS); @@ -66,7 +66,7 @@ IceUtilInternal::CountDownLatch::await() const #ifdef _WIN32 while(InterlockedExchangeAdd(&_count, 0) > 0) { -# ifndef ICE_OS_WINRT +# ifndef ICE_OS_UWP DWORD rc = WaitForSingleObject(_event, INFINITE); # else DWORD rc = WaitForSingleObjectEx(_event, INFINITE, false); diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index f4d961713bd..4c83a32799e 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -36,7 +36,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro string value; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP value = properties->getProperty("Ice.Default.SourceAddress"); if(!value.empty()) { diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index d70e14bd74a..00bfb97131e 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -133,7 +133,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib += libName; lib += version; -# ifdef ICE_OS_WINRT +# ifdef ICE_OS_UWP lib += "uwp"; # endif @@ -217,7 +217,7 @@ IceInternal::DynamicLibrary::load(const string& lib) // Don't need to use a wide string converter as the wide string is passed // to Windows API. // -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP _hnd = LoadPackagedLibrary(stringToWstring(lib, getProcessStringConverter()).c_str(), 0); #elif defined(_WIN32) _hnd = LoadLibraryW(stringToWstring(lib, getProcessStringConverter()).c_str()); diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp index 78827685267..eb0ee89facc 100644 --- a/cpp/src/Ice/EventHandler.cpp +++ b/cpp/src/Ice/EventHandler.cpp @@ -19,7 +19,7 @@ IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; } #endif IceInternal::EventHandler::EventHandler() : -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) _pending(SocketOperationNone), _started(SocketOperationNone), _completed(SocketOperationNone), diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index e7124182d76..21baae05edb 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -29,7 +29,7 @@ class ICE_API EventHandler : { public: -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) // // Called to start a new asynchronous read or write operation. // @@ -62,7 +62,7 @@ protected: EventHandler(); virtual ~EventHandler(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) SocketOperation _pending; SocketOperation _started; SocketOperation _completed; diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 460ff4dd809..4ac7d66cdd3 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -16,7 +16,7 @@ #include <Ice/InputStream.h> #include <Ice/Initialize.h> #include <IceUtil/StringUtil.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP # include <Ice/StringConverter.h> #endif #include <iomanip> @@ -35,7 +35,7 @@ socketErrorToString(int error) { return "unknown error"; } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP if(error == E_ACCESSDENIED) { ostringstream os; @@ -461,7 +461,7 @@ Ice::DNSException::ice_print(ostream& out) const { Exception::ice_print(out); out << ":\nDNS error: "; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP out << socketErrorToString(error); #else out << errorToStringDNS(error); diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index a33405d8118..aca36399b13 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -442,7 +442,7 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume ex.str = "no argument provided for --sourceAddress option in endpoint " + endpoint; throw ex; } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP const_cast<Address&>(_sourceAddr) = getNumericAddress(argument); if(!isAddressValid(_sourceAddr)) { @@ -486,7 +486,7 @@ IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, Input s->read(const_cast<Ice::Int&>(_port)); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance) : IceUtil::Thread("Ice.HostResolver"), @@ -698,7 +698,7 @@ IceInternal::EndpointHostResolver::resolve(const string& host, const EndpointI_connectorsPtr& callback) { // - // No DNS lookup support with WinRT. + // No DNS lookup support with UWP. // callback->connectors(endpoint->connectors(getAddresses(host, port, _instance->protocolSupport(), diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h index 7378792a7c7..dc89fa257b4 100644 --- a/cpp/src/Ice/IPEndpointI.h +++ b/cpp/src/Ice/IPEndpointI.h @@ -20,7 +20,7 @@ #include <Ice/ProtocolInstanceF.h> #include <Ice/ObserverHelper.h> -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP # include <deque> #endif @@ -108,7 +108,7 @@ private: mutable Ice::Int _hashValue; }; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP class ICE_API EndpointHostResolver : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex> #else class ICE_API EndpointHostResolver : public IceUtil::Shared @@ -127,7 +127,7 @@ public: private: -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP struct ResolveEntry { std::string host; diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index fb9e578d6a1..a39d2a4c04a 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -39,7 +39,7 @@ private: IceUtil::Mutex _mutex; }; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP class PerThreadImplicitContext : public ImplicitContextI { public: @@ -120,11 +120,11 @@ ImplicitContextI::create(const std::string& kind) } else if(kind == "PerThread") { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP return ICE_MAKE_SHARED(PerThreadImplicitContext); #else throw InitializationException(__FILE__, __LINE__, - "'PerThread' Ice.ImplicitContext isn't supported for WinRT."); + "'PerThread' Ice.ImplicitContext isn't supported for UWP."); return 0; // Keep the compiler happy. #endif } @@ -137,7 +137,7 @@ ImplicitContextI::create(const std::string& kind) } } -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) void ImplicitContextI::cleanupThread() { @@ -260,7 +260,7 @@ SharedImplicitContext::combine(const Context& proxyCtx, Context& ctx) const // // PerThreadImplicitContext implementation // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP long PerThreadImplicitContext::_nextId; PerThreadImplicitContext::IndexInUse* PerThreadImplicitContext::_indexInUse; IceUtil::Mutex* PerThreadImplicitContext::_mutex = 0; diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 304036dec90..7fe278d78ad 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -1063,7 +1063,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi if(instanceCount() == 1) { -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) WORD version = MAKEWORD(1, 1); WSADATA data; if(WSAStartup(version, &data) != 0) @@ -1208,7 +1208,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi // // Client ACM enabled by default. Server ACM disabled by default. // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP const_cast<ImplicitContextIPtr&>(_implicitContext) = ImplicitContextI::create(_initData.properties->getProperty("Ice.ImplicitContext")); #endif @@ -1304,7 +1304,7 @@ IceInternal::Instance::~Instance() } if(instanceCount() == 0) { -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) WSACleanup(); #endif @@ -1660,7 +1660,7 @@ IceInternal::Instance::destroy() { _serverThreadPool->joinWithAllThreads(); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(_endpointHostResolver) { _endpointHostResolver->getThreadControl().join(); diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp index 2396b4cf8c3..5ebf7c460cd 100644 --- a/cpp/src/Ice/LoggerI.cpp +++ b/cpp/src/Ice/LoggerI.cpp @@ -57,7 +57,7 @@ Ice::LoggerI::LoggerI(const string& prefix, const string& file, _convert(convert), _converter(getProcessStringConverter()), _sizeMax(sizeMax) -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) ,_consoleConverter(createWindowsStringConverter(GetConsoleOutputCP())) #endif { @@ -233,7 +233,7 @@ Ice::LoggerI::write(const string& message, bool indent) } else { -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) OutputDebugString(stringToWstring(s).c_str()); #elif defined(_WIN32) // diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h index 5c75dbd12b8..577e868818d 100644 --- a/cpp/src/Ice/LoggerI.h +++ b/cpp/src/Ice/LoggerI.h @@ -49,7 +49,7 @@ private: // after which rename could be attempted again. Otherwise is set to zero. // IceUtil::Time _nextRetry; -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) const StringConverterPtr _consoleConverter; #endif diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 2620a8a34be..270249ed601 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -30,7 +30,7 @@ #include <IceUtil/Random.h> #include <functional> -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) # include <IceUtil/InputUtil.h> # include <IceUtil/CountDownLatch.h> #elif defined(_WIN32) @@ -78,7 +78,7 @@ using namespace std; using namespace Ice; using namespace IceInternal; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP using namespace Platform; using namespace Windows::Foundation; using namespace Windows::Foundation::Collections; @@ -105,7 +105,7 @@ IceInternal::getSystemErrno() namespace { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP struct AddressIsIPv6 : public unary_function<Address, bool> { public: @@ -174,7 +174,7 @@ setKeepAlive(SOCKET fd) } #endif -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) void setTcpLoopbackFastPath(SOCKET fd) { @@ -198,7 +198,7 @@ setTcpLoopbackFastPath(SOCKET fd) } #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP SOCKET createSocketImpl(bool udp, int) { @@ -244,7 +244,7 @@ createSocketImpl(bool udp, int family) setTcpNoDelay(fd); setKeepAlive(fd); -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) // // FIX: the fast path loopback appears to cause issues with // connection closure when it's enabled. Sometime, a peer @@ -261,7 +261,7 @@ createSocketImpl(bool udp, int family) } #endif -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP vector<Address> getLocalAddresses(ProtocolSupport protocol, bool includeLoopback) { @@ -773,7 +773,7 @@ getAddressStorageSize(const Address& addr) return size; } -#endif // #ifndef ICE_OS_WINRT +#endif // #ifndef ICE_OS_UWP } @@ -819,7 +819,7 @@ IceInternal::NativeInfo::completed(SocketOperation operation) } } -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) void IceInternal::NativeInfo::queueAction(SocketOperation op, IAsyncAction^ action, bool connect) @@ -954,7 +954,7 @@ IceInternal::NativeInfo::newFd() bool IceInternal::noMoreFds(int error) { -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) return error == (int)SocketErrorStatus::TooManyOpenFiles; #elif defined(_WIN32) return error == WSAEMFILE; @@ -963,7 +963,7 @@ IceInternal::noMoreFds(int error) #endif } -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) string IceInternal::errorToStringDNS(int) { @@ -981,7 +981,7 @@ IceInternal::errorToStringDNS(int error) } #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP vector<Address> IceInternal::getAddresses(const string& host, int port, ProtocolSupport, Ice::EndpointSelectionType, bool, bool) { @@ -1145,11 +1145,11 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol } #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP ProtocolSupport IceInternal::getProtocolSupport(const Address&) { - // For WinRT, there's no distinction between IPv4 and IPv6 adresses. + // For UWP, there's no distinction between IPv4 and IPv6 adresses. return EnableBoth; } #else @@ -1170,7 +1170,7 @@ IceInternal::getAddressForServer(const string& host, int port, ProtocolSupport p if(host.empty()) { Address addr; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP ostringstream os; os << port; // @@ -1202,7 +1202,7 @@ IceInternal::getAddressForServer(const string& host, int port, ProtocolSupport p int IceInternal::compareAddress(const Address& addr1, const Address& addr2) { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP int o = String::CompareOrdinal(addr1.port, addr2.port); if(o != 0) { @@ -1277,7 +1277,7 @@ IceInternal::compareAddress(const Address& addr1, const Address& addr2) #endif } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP bool IceInternal::isIPv6Supported() { @@ -1300,7 +1300,7 @@ IceInternal::isIPv6Supported() } #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP SOCKET IceInternal::createSocket(bool udp, const Address&) { @@ -1314,7 +1314,7 @@ IceInternal::createSocket(bool udp, const Address& addr) } #endif -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP SOCKET IceInternal::createServerSocket(bool udp, const Address& addr, ProtocolSupport protocol) { @@ -1349,7 +1349,7 @@ IceInternal::createServerSocket(bool udp, const Address& addr, ProtocolSupport) void IceInternal::closeSocketNoThrow(SOCKET fd) { -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) // // NOTE: StreamSocket::Close or DatagramSocket::Close aren't // exposed in C++, you have to delete the socket to close @@ -1372,7 +1372,7 @@ IceInternal::closeSocketNoThrow(SOCKET fd) void IceInternal::closeSocket(SOCKET fd) { -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) // // NOTE: StreamSocket::Close or DatagramSocket::Close aren't // exposed in C++, you have to delete the socket to close @@ -1423,7 +1423,7 @@ IceInternal::addrToString(const Address& addr) void IceInternal::fdToLocalAddress(SOCKET fd, Address& addr) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP socklen_t len = static_cast<socklen_t>(sizeof(sockaddr_storage)); if(getsockname(fd, &addr.sa, &len) == SOCKET_ERROR) { @@ -1450,7 +1450,7 @@ IceInternal::fdToLocalAddress(SOCKET fd, Address& addr) bool IceInternal::fdToRemoteAddress(SOCKET fd, Address& addr) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP socklen_t len = static_cast<socklen_t>(sizeof(sockaddr_storage)); if(getpeername(fd, &addr.sa, &len) == SOCKET_ERROR) { @@ -1605,14 +1605,14 @@ IceInternal::addressesToString(const Address& localAddr, const Address& remoteAd bool IceInternal::isAddressValid(const Address& addr) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP return addr.saStorage.ss_family != AF_UNSPEC; #else return addr.host != nullptr || addr.port != nullptr; #endif } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP vector<string> IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport protocolSupport, bool includeLoopback) { @@ -1671,7 +1671,7 @@ IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport proto string IceInternal::inetAddrToString(const Address& ss) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP int size = getAddressStorageSize(ss); if(size == 0) { @@ -1701,7 +1701,7 @@ IceInternal::inetAddrToString(const Address& ss) int IceInternal::getPort(const Address& addr) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(addr.saStorage.ss_family == AF_INET) { return ntohs(addr.saIn.sin_port); @@ -1730,7 +1730,7 @@ IceInternal::getPort(const Address& addr) void IceInternal::setPort(Address& addr, int port) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(addr.saStorage.ss_family == AF_INET) { addr.saIn.sin_port = htons(port); @@ -1754,7 +1754,7 @@ IceInternal::setPort(Address& addr, int port) bool IceInternal::isMulticast(const Address& addr) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(addr.saStorage.ss_family == AF_INET) { return IN_MULTICAST(ntohl(addr.saIn.sin_addr.s_addr)); @@ -1867,7 +1867,7 @@ IceInternal::setTcpBufSize(SOCKET fd, int rcvSize, int sndSize, const ProtocolIn } } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP void IceInternal::setBlock(SOCKET fd, bool) { @@ -1931,7 +1931,7 @@ IceInternal::setBlock(SOCKET fd, bool block) void IceInternal::setSendBufferSize(SOCKET fd, int sz) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(setsockopt(fd, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<char*>(&sz), int(sizeof(int))) == SOCKET_ERROR) { closeSocketNoThrow(fd); @@ -1951,7 +1951,7 @@ IceInternal::setSendBufferSize(SOCKET fd, int sz) int IceInternal::getSendBufferSize(SOCKET fd) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP int sz; socklen_t len = sizeof(sz); if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<char*>(&sz), &len) == SOCKET_ERROR || @@ -1973,7 +1973,7 @@ IceInternal::getSendBufferSize(SOCKET fd) #endif } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP void IceInternal::setRecvBufferSize(SOCKET, int) { @@ -1995,7 +1995,7 @@ IceInternal::setRecvBufferSize(SOCKET fd, int sz) int IceInternal::getRecvBufferSize(SOCKET fd) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP int sz; socklen_t len = sizeof(sz); if(getsockopt(fd, SOL_SOCKET, SO_RCVBUF, reinterpret_cast<char*>(&sz), &len) == SOCKET_ERROR || @@ -2012,7 +2012,7 @@ IceInternal::getRecvBufferSize(SOCKET fd) #endif } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP void IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string& intf) { @@ -2046,7 +2046,7 @@ IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string&) try { // - // NOTE: WinRT doesn't allow specyfing the interface. + // NOTE: UWP doesn't allow specyfing the interface. // safe_cast<DatagramSocket^>(fd)->JoinMulticastGroup(group.host); } @@ -2057,7 +2057,7 @@ IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string&) } #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP void IceInternal::setMcastInterface(SOCKET, const string&, const Address&) { @@ -2087,7 +2087,7 @@ IceInternal::setMcastInterface(SOCKET fd, const string& intf, const Address& add } #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP void IceInternal::setMcastTtl(SOCKET, int, const Address&) { @@ -2115,7 +2115,7 @@ IceInternal::setMcastTtl(SOCKET fd, int ttl, const Address& addr) } #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP void IceInternal::setReuseAddress(SOCKET, bool) { @@ -2136,7 +2136,7 @@ IceInternal::setReuseAddress(SOCKET fd, bool reuse) #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP namespace { @@ -2174,7 +2174,7 @@ checkResultAndWait(IAsyncAction^ action) Address IceInternal::doBind(SOCKET fd, const Address& addr) { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP Address local; try { @@ -2238,7 +2238,7 @@ IceInternal::doBind(SOCKET fd, const Address& addr) #endif } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP Address IceInternal::getNumericAddress(const std::string& address) @@ -2704,7 +2704,7 @@ IceInternal::createPipe(SOCKET fds[2]) #endif } -#else // ICE_OS_WINRT +#else // ICE_OS_UWP void IceInternal::checkConnectErrorCode(const char* file, int line, HRESULT herr) diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index 8c130b5a4d6..441fa79b893 100755 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -24,7 +24,7 @@ #include <Ice/ProtocolInstanceF.h> #include <Ice/EndpointTypes.h> -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) // Nothing to include #elif defined(_WIN32) # include <winsock2.h> @@ -50,7 +50,7 @@ typedef int ssize_t; #elif defined(__APPLE__) && !defined(ICE_NO_CFSTREAM) # define ICE_USE_CFSTREAM 1 #elif defined(_WIN32) -# if defined(ICE_OS_WINRT) +# if defined(ICE_OS_UWP) # elif !defined(ICE_NO_IOCP) # define ICE_USE_IOCP 1 # else @@ -68,7 +68,7 @@ typedef int socklen_t; # define SOCKET int # define INVALID_SOCKET -1 # define SOCKET_ERROR -1 -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) typedef Platform::Object^ SOCKET; # define INVALID_SOCKET nullptr # define SOCKET_ERROR -1 @@ -115,7 +115,7 @@ namespace IceInternal // // Use Address struct or union depending on the platform // -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP struct ICE_API Address { Windows::Networking::HostName^ host; @@ -152,17 +152,17 @@ enum SocketOperation }; // -// On WinRT, wait only for read to return, on IOCP/Win32 wait for +// On UWP, wait only for read to return, on IOCP/Win32 wait for // both pending read and write operations to complete (#ICE-6695). // -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) const int SocketOperationWaitForClose = 1; #elif defined(ICE_USE_IOCP) const int SocketOperationWaitForClose = 3; #endif // -// AsyncInfo struct for Windows IOCP or WinRT holds the result of +// AsyncInfo struct for Windows IOCP or UWP holds the result of // asynchronous operations after it completed. // #if defined(ICE_USE_IOCP) @@ -176,7 +176,7 @@ struct ICE_API AsyncInfo : WSAOVERLAPPED DWORD count; int error; }; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) struct ICE_API AsyncInfo { Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ completedHandler; @@ -205,7 +205,7 @@ public: virtual ~NativeInfo(); NativeInfo(SOCKET socketFd = INVALID_SOCKET) : _fd(socketFd) -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) , _newFd(INVALID_SOCKET) #endif { @@ -231,7 +231,7 @@ public: virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0; void initialize(HANDLE, ULONG_PTR); void completed(SocketOperation); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0; void queueAction(SocketOperation, Windows::Foundation::IAsyncAction^, bool = false); void queueOperation(SocketOperation, Windows::Foundation::IAsyncOperation<unsigned int>^); @@ -250,7 +250,7 @@ protected: #if defined(ICE_USE_IOCP) HANDLE _handle; ULONG_PTR _key; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, bool = false); SocketOperationCompletedHandler^ _completedHandler; #else @@ -307,7 +307,7 @@ ICE_API void setReuseAddress(SOCKET, bool); ICE_API Address doBind(SOCKET, const Address&); ICE_API void doListen(SOCKET, int); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP ICE_API bool interrupted(); ICE_API bool acceptInterrupted(); ICE_API bool noBuffers(); diff --git a/cpp/src/Ice/NetworkF.h b/cpp/src/Ice/NetworkF.h index 59548bc586d..9c7fc7f1cc6 100644 --- a/cpp/src/Ice/NetworkF.h +++ b/cpp/src/Ice/NetworkF.h @@ -17,7 +17,7 @@ namespace IceInternal { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP struct ICE_API Address; #else union Address; diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp index bdcf580b8d1..b4055bad7b9 100644 --- a/cpp/src/Ice/NetworkProxy.cpp +++ b/cpp/src/Ice/NetworkProxy.cpp @@ -22,7 +22,7 @@ NetworkProxy::~NetworkProxy() // Out of line to avoid weak vtable } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP namespace { @@ -304,8 +304,8 @@ IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSu proxyHost = properties->getProperty("Ice.SOCKSProxyHost"); if(!proxyHost.empty()) { -#ifdef ICE_OS_WINRT - throw Ice::InitializationException(__FILE__, __LINE__, "SOCKS proxy not supported with WinRT"); +#ifdef ICE_OS_UWP + throw Ice::InitializationException(__FILE__, __LINE__, "SOCKS proxy not supported with UWP"); #else if(protocolSupport == EnableIPv6) { @@ -319,8 +319,8 @@ IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSu proxyHost = properties->getProperty("Ice.HTTPProxyHost"); if(!proxyHost.empty()) { -#ifdef ICE_OS_WINRT - throw Ice::InitializationException(__FILE__, __LINE__, "HTTP proxy not supported with WinRT"); +#ifdef ICE_OS_UWP + throw Ice::InitializationException(__FILE__, __LINE__, "HTTP proxy not supported with UWP"); #else return new HTTPNetworkProxy(proxyHost, properties->getPropertyAsIntWithDefault("Ice.HTTPProxyPort", 1080)); #endif diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index f3461f47320..27de7af6881 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -301,7 +301,7 @@ Ice::PropertiesI::load(const std::string& file) // // Metro style applications cannot access Windows registry. // -#if defined (_WIN32) && !defined(ICE_OS_WINRT) +#if defined (_WIN32) && !defined(ICE_OS_UWP) if(file.find("HKLM\\") == 0) { HKEY iceKey; @@ -711,9 +711,9 @@ void Ice::PropertiesI::loadConfig() { string value = getProperty("Ice.Config"); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP // - // WinRT cannot access environment variables + // UWP cannot access environment variables // if(value.empty() || value == "1") { diff --git a/cpp/src/Ice/SHA1.cpp b/cpp/src/Ice/SHA1.cpp index 4373afa15f8..141ffda9a6a 100644 --- a/cpp/src/Ice/SHA1.cpp +++ b/cpp/src/Ice/SHA1.cpp @@ -9,7 +9,7 @@ #include <IceUtil/SHA1.h> -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP # if defined(_WIN32) # include <Wincrypt.h> # include <IceUtil/Exception.h> @@ -23,7 +23,7 @@ using namespace std; using namespace IceUtil; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP namespace IceUtilInternal { @@ -163,7 +163,7 @@ IceUtilInternal::SHA1::finalize(std::vector<unsigned char>& md) void IceUtilInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md) { -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) auto dataA = ref new Platform::Array<unsigned char>(const_cast<unsigned char*>(data), static_cast<unsigned int>(length)); auto hasher = Windows::Security::Cryptography::Core::HashAlgorithmProvider::OpenAlgorithm("SHA1"); diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index 2bd129cc330..bf4f57abfbd 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -22,13 +22,13 @@ using namespace std; using namespace IceInternal; -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) using namespace Windows::Storage::Streams; using namespace Windows::Networking; using namespace Windows::Networking::Sockets; #endif -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) Selector::Selector(const InstancePtr& instance) : _instance(instance) { diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h index 4f433c32aa4..7434a240763 100644 --- a/cpp/src/Ice/Selector.h +++ b/cpp/src/Ice/Selector.h @@ -43,7 +43,7 @@ struct __CFSocket; typedef struct __CFSocket * CFSocketRef; #endif -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) # include <deque> #endif @@ -58,11 +58,11 @@ class SelectorTimeoutException }; -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) class Selector { -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) struct SelectEvent { SelectEvent(const EventHandlerPtr& handler, SocketOperation status) : handler(handler), status(status) diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index 7a405c30a3d..5b6d6eb36d1 100755 --- a/cpp/src/Ice/StreamSocket.cpp +++ b/cpp/src/Ice/StreamSocket.cpp @@ -13,7 +13,7 @@ using namespace IceInternal; -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) #include <Ice/Properties.h> using namespace Platform; @@ -36,7 +36,7 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, #endif { init(); -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr)) { _state = _proxy ? StateProxyWrite : StateConnected; @@ -92,7 +92,7 @@ StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer) { #if defined(ICE_USE_IOCP) doFinishConnectAsync(_fd, _write); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) if(_write.count == SOCKET_ERROR) { try @@ -153,7 +153,7 @@ StreamSocket::isConnected() size_t StreamSocket::getSendPacketSize(size_t length) { -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) return _maxSendPacketSize > 0 ? std::min(length, _maxSendPacketSize) : length; #else return length; @@ -163,7 +163,7 @@ StreamSocket::getSendPacketSize(size_t length) size_t StreamSocket::getRecvPacketSize(size_t length) { -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) return _maxRecvPacketSize > 0 ? std::min(length, _maxRecvPacketSize) : length; #else return length; @@ -179,7 +179,7 @@ StreamSocket::setBufferSize(int rcvSize, int sndSize) SocketOperation StreamSocket::read(Buffer& buf) { -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) if(_state == StateProxyRead) { while(true) @@ -205,7 +205,7 @@ StreamSocket::read(Buffer& buf) SocketOperation StreamSocket::write(Buffer& buf) { -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) if(_state == StateProxyWrite) { while(true) @@ -228,7 +228,7 @@ StreamSocket::write(Buffer& buf) return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationNone; } -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) ssize_t StreamSocket::read(char* buf, size_t length) { @@ -368,7 +368,7 @@ StreamSocket::write(const char* buf, size_t length) } #endif -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) AsyncInfo* StreamSocket::getAsyncInfo(SocketOperation op) { @@ -526,7 +526,7 @@ StreamSocket::finishRead(Buffer& buf) } -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) bool StreamSocket::startWrite(Buffer& buf) @@ -679,7 +679,7 @@ StreamSocket::init() // _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_fd)); _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_fd)); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) Windows::Networking::Sockets::StreamSocket^ s = safe_cast<Windows::Networking::Sockets::StreamSocket^>(_fd); _writer = ref new Windows::Storage::Streams::DataWriter(s->OutputStream); _reader = ref new Windows::Storage::Streams::DataReader(s->InputStream); diff --git a/cpp/src/Ice/StreamSocket.h b/cpp/src/Ice/StreamSocket.h index 3d092d20ba2..b38c8f2ad88 100644 --- a/cpp/src/Ice/StreamSocket.h +++ b/cpp/src/Ice/StreamSocket.h @@ -36,16 +36,16 @@ public: SocketOperation read(Buffer&); SocketOperation write(Buffer&); -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) ssize_t read(char*, size_t); ssize_t write(const char*, size_t); #endif -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) AsyncInfo* getAsyncInfo(SocketOperation); #endif -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startWrite(Buffer&); void finishWrite(Buffer&); void startRead(Buffer&); @@ -78,14 +78,14 @@ private: State _state; std::string _desc; -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) size_t _maxSendPacketSize; size_t _maxRecvPacketSize; AsyncInfo _read; AsyncInfo _write; #endif -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) Windows::Storage::Streams::DataReader^ _reader; Windows::Storage::Streams::DataWriter^ _writer; #endif diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index bf1fd17e410..e601c3418db 100755 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -19,7 +19,7 @@ #if defined(ICE_USE_IOCP) # include <Mswsock.h> -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) using namespace Platform; using namespace Windows::Foundation; using namespace Windows::Storage::Streams; @@ -49,7 +49,7 @@ IceInternal::TcpAcceptor::getNativeInfo() void IceInternal::TcpAcceptor::close() { -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) IceUtil::Mutex::Lock lock(_mutex); if(_acceptPending) { @@ -81,7 +81,7 @@ IceInternal::TcpAcceptor::listen() try { const_cast<Address&>(_addr) = doBind(_fd, _addr); -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) doListen(_fd, _backlog); #endif } @@ -172,7 +172,7 @@ IceInternal::TcpAcceptor::accept() return new TcpTransceiver(_instance, new StreamSocket(_instance, fd)); } -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) AsyncInfo* IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation) @@ -290,7 +290,7 @@ IceInternal::TcpAcceptor::TcpAcceptor(const TcpEndpointIPtr& endpoint, { _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", SOMAXCONN); -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) _fd = ref new StreamSocketListener(); safe_cast<StreamSocketListener^>(_fd)->ConnectionReceived += ref new TypedEventHandler<StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^>( diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h index 2d9fc24d72f..bb4b17ceb6f 100644 --- a/cpp/src/Ice/TcpAcceptor.h +++ b/cpp/src/Ice/TcpAcceptor.h @@ -15,7 +15,7 @@ #include <Ice/Acceptor.h> #include <Ice/Network.h> -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) #include <deque> #endif @@ -29,13 +29,13 @@ class TcpAcceptor : public Acceptor, public NativeInfo public: virtual NativeInfoPtr getNativeInfo(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual AsyncInfo* getAsyncInfo(SocketOperation); #endif virtual void close(); virtual EndpointIPtr listen(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual void startAccept(); virtual void finishAccept(); #endif @@ -63,7 +63,7 @@ private: int _acceptError; std::vector<char> _acceptBuf; AsyncInfo _info; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) IceUtil::Mutex _mutex; bool _acceptPending; std::deque<Windows::Networking::Sockets::StreamSocket^> _accepted; diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index 808ac140443..759d6e08baa 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -56,7 +56,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf) return _stream->read(buf); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool IceInternal::TcpTransceiver::startWrite(Buffer& buf) { diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h index dc3d279d6dc..c892d683e79 100644 --- a/cpp/src/Ice/TcpTransceiver.h +++ b/cpp/src/Ice/TcpTransceiver.h @@ -33,7 +33,7 @@ public: virtual void close(); virtual SocketOperation write(Buffer&); virtual SocketOperation read(Buffer&); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual bool startWrite(Buffer&); virtual void finishWrite(Buffer&); virtual void startRead(Buffer&); diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp index 7882a0a2948..80990aeb8ce 100644 --- a/cpp/src/Ice/Thread.cpp +++ b/cpp/src/Ice/Thread.cpp @@ -22,7 +22,7 @@ #include <climits> #include <exception> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP # include <thread> #endif @@ -33,7 +33,7 @@ using namespace std; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP IceUtil::ThreadControl::ThreadControl() : _id(this_thread::get_id()) diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 3769458371b..8294b7c272a 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -18,7 +18,7 @@ #include <Ice/Properties.h> #include <Ice/TraceLevels.h> -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) # include <Ice/StringConverter.h> #endif @@ -155,7 +155,7 @@ IceInternal::ThreadPoolWorkQueue::destroy() //Lock sync(*this); Called with the thread pool locked assert(!_destroyed); _destroyed = true; -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) _threadPool._selector.completed(this, SocketOperationRead); #else _threadPool._selector.ready(this, SocketOperationRead, true); @@ -167,7 +167,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item) { //Lock sync(*this); Called with the thread pool locked _workItems.push_back(item); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) _threadPool._selector.completed(this, SocketOperationRead); #else if(_workItems.size() == 1) @@ -177,7 +177,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item) #endif } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool IceInternal::ThreadPoolWorkQueue::startAsync(SocketOperation) { @@ -204,7 +204,7 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current) workItem = _workItems.front(); _workItems.pop_front(); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) else { assert(_destroyed); @@ -266,14 +266,14 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p _threadIdleTime(0), _stackSize(0), _inUse(0), -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) _inUseIO(0), _nextHandler(_handlers.end()), #endif _promote(true) { PropertiesPtr properties = _instance->initializationData().properties; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP # ifdef _WIN32 SYSTEM_INFO sysInfo; GetSystemInfo(&sysInfo); @@ -297,7 +297,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p } int sizeMax = properties->getPropertyAsIntWithDefault(_prefix + ".SizeMax", size); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(sizeMax == -1) { sizeMax = nProcessors; @@ -335,7 +335,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p const_cast<int&>(_size) = size; const_cast<int&>(_sizeMax) = sizeMax; const_cast<int&>(_sizeWarn) = sizeWarn; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP const_cast<int&>(_sizeIO) = min(sizeMax, nProcessors); #else const_cast<int&>(_sizeIO) = sizeMax; @@ -492,7 +492,7 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler, bool closeNow) { Lock sync(*this); assert(!_destroyed); -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) closeNow = _selector.finish(handler.get(), closeNow); // This must be called before! _workQueue->queue(new FinishedWorkItem(handler, !closeNow)); return closeNow; @@ -600,7 +600,7 @@ IceInternal::ThreadPool::prefix() const void IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) { -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) ThreadPoolCurrent current(_instance, this, thread); bool select = false; while(true) @@ -751,7 +751,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) try { current._ioCompleted = false; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _threadIdleTime)); #else current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, current._count, current._error, @@ -770,7 +770,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) } else if(_inUse < static_cast<int>(_threads.size() - 1)) // If not the last idle thread, we can exit. { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP BOOL hasIO = false; GetThreadIOPendingFlag(GetCurrentThread(), &hasIO); if(hasIO) @@ -801,7 +801,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) try { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP current._handler = ICE_GET_SHARED_FROM_THIS(_selector.getNextHandler(current.operation, _serverIdleTime)); #else @@ -839,7 +839,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) Error out(_instance->initializationData().logger); out << "exception in `" << _prefix << "':\n" << ex << "\nevent handler: " << current._handler->toString(); } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP catch(Platform::Exception^ ex) { // @@ -883,7 +883,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current) if(_sizeMax > 1) { -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) --_inUseIO; if(!_destroyed) @@ -953,7 +953,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current) return _serialize && current._handler.get() != _workQueue.get(); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current) { @@ -965,7 +965,7 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current) current._handler->_completed = static_cast<SocketOperation>(current._handler->_completed | current.operation); current._handler->_started = static_cast<SocketOperation>(current._handler->_started & ~current.operation); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP AsyncInfo* info = current._handler->getNativeInfo()->getAsyncInfo(current.operation); info->count = current._count; info->error = current._error; @@ -1248,7 +1248,7 @@ ThreadPoolCurrent::ThreadPoolCurrent(const InstancePtr& instance, _threadPool(threadPool.get()), _thread(thread), _ioCompleted(false) -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) , _leader(false) #endif { diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index 6ff21fb606d..fbca641eb68 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -121,7 +121,7 @@ private: bool ioCompleted(ThreadPoolCurrent&); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startMessage(ThreadPoolCurrent&); void finishMessage(ThreadPoolCurrent&); #else @@ -160,7 +160,7 @@ private: std::set<EventHandlerThreadPtr> _threads; // All threads, running or not. int _inUse; // Number of threads that are currently in use. -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) int _inUseIO; // Number of threads that are currently performing IO. std::vector<std::pair<EventHandler*, SocketOperation> > _handlers; std::vector<std::pair<EventHandler*, SocketOperation> >::const_iterator _nextHandler; @@ -183,7 +183,7 @@ public: return _threadPool->ioCompleted(const_cast<ThreadPoolCurrent&>(*this)); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startMessage() { return _threadPool->startMessage(const_cast<ThreadPoolCurrent&>(*this)); @@ -211,7 +211,7 @@ private: ThreadPool::EventHandlerThreadPtr _thread; EventHandlerPtr _handler; bool _ioCompleted; -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) bool _leader; #else DWORD _count; @@ -229,7 +229,7 @@ public: void destroy(); void queue(const ThreadPoolWorkItemPtr&); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool startAsync(SocketOperation); bool finishAsync(SocketOperation); #endif @@ -256,7 +256,7 @@ private: // the IOCP implementation and ensures that finishMessage isn't called multiple // times. // -#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP) template<class T> class ThreadPoolMessage { public: diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h index f21e3a27aaf..4c5a02ba12a 100644 --- a/cpp/src/Ice/Transceiver.h +++ b/cpp/src/Ice/Transceiver.h @@ -34,7 +34,7 @@ public: virtual EndpointIPtr bind(); virtual SocketOperation write(Buffer&) = 0; virtual SocketOperation read(Buffer&) = 0; -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual bool startWrite(Buffer&) = 0; virtual void finishWrite(Buffer&) = 0; virtual void startRead(Buffer&) = 0; diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp index ec98c4c0f76..ccf85403c35 100644 --- a/cpp/src/Ice/UdpConnector.cpp +++ b/cpp/src/Ice/UdpConnector.cpp @@ -124,7 +124,7 @@ IceInternal::UdpConnector::UdpConnector(const ProtocolInstancePtr& instance, con const std::string& connectionId) : _instance(instance), _addr(addr), -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP _sourceAddr(sourceAddr), #endif _mcastInterface(mcastInterface), diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index aac82cf874d..4621750689e 100755 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -17,14 +17,14 @@ #include <Ice/Properties.h> #include <IceUtil/StringUtil.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP # include <ppltasks.h> // For Concurrency::task #endif using namespace std; using namespace Ice; using namespace IceInternal; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP using namespace Platform; using namespace Windows::Foundation; using namespace Windows::Storage::Streams; @@ -40,7 +40,7 @@ IceInternal::UdpTransceiver::getNativeInfo() return this; } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) AsyncInfo* IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status) { @@ -55,7 +55,7 @@ IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status) assert(false); return 0; } -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) return &_write; #endif } @@ -73,7 +73,7 @@ IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeB { #if defined(ICE_USE_IOCP) doFinishConnectAsync(_fd, _write); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) if(_write.count == SOCKET_ERROR) { try @@ -106,7 +106,7 @@ IceInternal::UdpTransceiver::closing(bool, const Ice::LocalException&) void IceInternal::UdpTransceiver::close() { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP IceUtil::Mutex::Lock lock(_mutex); if(_readPending) { @@ -182,7 +182,7 @@ IceInternal::UdpTransceiver::write(Buffer& buf) { return SocketOperationNone; } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP return SocketOperationWrite; #else assert(buf.i == buf.b.begin()); @@ -260,7 +260,7 @@ IceInternal::UdpTransceiver::read(Buffer& buf) { return SocketOperationNone; } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP return SocketOperationRead; #else @@ -359,7 +359,7 @@ repeat: #endif } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool IceInternal::UdpTransceiver::startWrite(Buffer& buf) { @@ -369,7 +369,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf) assert(min(_maxPacketSize, _sndSize - _udpOverhead) >= static_cast<int>(buf.b.size())); assert(_fd != INVALID_SOCKET); -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP if(_state < StateConnected) { try @@ -559,7 +559,7 @@ IceInternal::UdpTransceiver::finishWrite(Buffer& buf) if(static_cast<int>(_write.count) == SOCKET_ERROR) { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP WSASetLastError(_write.error); if(connectionLost()) { @@ -589,7 +589,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf) buf.b.resize(packetSize); buf.i = buf.b.begin(); assert(!buf.b.empty() && buf.i != buf.b.end()); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP _read.buf.len = packetSize; _read.buf.buf = reinterpret_cast<char*>(&*buf.i); int err; @@ -645,7 +645,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf) void IceInternal::UdpTransceiver::finishRead(Buffer& buf) { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP IceUtil::Mutex::Lock lock(_mutex); assert(!_readPending && (!_received.empty() || _fd == INVALID_SOCKET)); if(_fd == INVALID_SOCKET) @@ -749,7 +749,7 @@ IceInternal::UdpTransceiver::toString() const } else { -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP s << fdToString(_fd); #else Address localAddr; @@ -784,7 +784,7 @@ Ice::ConnectionInfoPtr IceInternal::UdpTransceiver::getInfo() const { Ice::UDPConnectionInfoPtr info = ICE_MAKE_SHARED(Ice::UDPConnectionInfo); -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) if(isMulticast(_addr) || isAddressValid(_mcastAddr)) { info->remotePort = 0; @@ -859,7 +859,7 @@ IceInternal::UdpTransceiver::effectivePort() const IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance, const Address& addr, -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP const Address&, const string&, int @@ -877,7 +877,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance, #if defined(ICE_USE_IOCP) , _read(SocketOperationRead), _write(SocketOperationWrite) -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) , _readPending(false) #endif { @@ -885,7 +885,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance, setBufSize(-1, -1); setBlock(_fd, false); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP _mcastAddr.saStorage.ss_family = AF_UNSPEC; _peerAddr.saStorage.ss_family = AF_UNSPEC; // Not initialized yet. @@ -956,7 +956,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const UdpEndpointIPtr& endpoint, con _mcastInterface(mcastInterface), _port(port), _state(connect ? StateNeedConnect : StateNotConnected) -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP , _readPending(false) #elif defined(ICE_USE_IOCP) , _read(SocketOperationRead), @@ -967,7 +967,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const UdpEndpointIPtr& endpoint, con setBufSize(-1, -1); setBlock(_fd, false); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP memset(&_mcastAddr.saStorage, 0, sizeof(sockaddr_storage)); memset(&_peerAddr.saStorage, 0, sizeof(sockaddr_storage)); _peerAddr.saStorage.ss_family = AF_UNSPEC; @@ -1104,7 +1104,7 @@ IceInternal::UdpTransceiver::setBufSize(int rcvSize, int sndSize) } } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP void IceInternal::UdpTransceiver::appendMessage(DatagramSocketMessageReceivedEventArgs^ args) { diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h index fa81553eb3c..c2c1ff0edc5 100644 --- a/cpp/src/Ice/UdpTransceiver.h +++ b/cpp/src/Ice/UdpTransceiver.h @@ -16,7 +16,7 @@ #include <Ice/Transceiver.h> #include <Ice/Network.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP # include <deque> #endif @@ -38,7 +38,7 @@ class UdpTransceiver : public Transceiver, public NativeInfo public: virtual NativeInfoPtr getNativeInfo(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual AsyncInfo* getAsyncInfo(SocketOperation); #endif @@ -48,7 +48,7 @@ public: virtual EndpointIPtr bind(); virtual SocketOperation write(Buffer&); virtual SocketOperation read(Buffer&); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual bool startWrite(Buffer&); virtual void finishWrite(Buffer&); virtual void startRead(Buffer&); @@ -73,7 +73,7 @@ private: void setBufSize(int, int); -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP void appendMessage(Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^); Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^ readMessage(); #endif @@ -103,7 +103,7 @@ private: AsyncInfo _write; Address _readAddr; socklen_t _readAddrLen; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) AsyncInfo _write; Windows::Storage::Streams::DataWriter^ _writer; IceUtil::Mutex _mutex; diff --git a/cpp/src/Ice/WSAcceptor.cpp b/cpp/src/Ice/WSAcceptor.cpp index d72414dae60..52a786674c0 100644 --- a/cpp/src/Ice/WSAcceptor.cpp +++ b/cpp/src/Ice/WSAcceptor.cpp @@ -21,7 +21,7 @@ IceInternal::WSAcceptor::getNativeInfo() return _delegate->getNativeInfo(); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) IceInternal::AsyncInfo* IceInternal::WSAcceptor::getAsyncInfo(IceInternal::SocketOperation status) { @@ -42,7 +42,7 @@ IceInternal::WSAcceptor::listen() return _endpoint; } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) void IceInternal::WSAcceptor::startAccept() { diff --git a/cpp/src/Ice/WSAcceptor.h b/cpp/src/Ice/WSAcceptor.h index 0b389f6a210..251d0a8e528 100644 --- a/cpp/src/Ice/WSAcceptor.h +++ b/cpp/src/Ice/WSAcceptor.h @@ -26,13 +26,13 @@ class WSAcceptor : public Acceptor, public NativeInfo public: virtual NativeInfoPtr getNativeInfo(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual AsyncInfo* getAsyncInfo(SocketOperation); #endif virtual void close(); virtual EndpointIPtr listen(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual void startAccept(); virtual void finishAccept(); #endif diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp index 0c33cfe8d8f..2c074c75974 100644 --- a/cpp/src/Ice/WSTransceiver.cpp +++ b/cpp/src/Ice/WSTransceiver.cpp @@ -133,7 +133,7 @@ Long ice_nlltoh(const Byte* src) return v; } -#if defined(ICE_OS_WINRT) +#if defined(ICE_OS_UWP) Short htons(Short v) { Short result; @@ -184,7 +184,7 @@ IceInternal::WSTransceiver::getNativeInfo() return _delegate->getNativeInfo(); } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) AsyncInfo* IceInternal::WSTransceiver::getAsyncInfo(SocketOperation status) { @@ -646,7 +646,7 @@ IceInternal::WSTransceiver::read(Buffer& buf) return s; } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) bool IceInternal::WSTransceiver::startWrite(Buffer& buf) { diff --git a/cpp/src/Ice/WSTransceiver.h b/cpp/src/Ice/WSTransceiver.h index c34a8438c7e..25cf1067163 100644 --- a/cpp/src/Ice/WSTransceiver.h +++ b/cpp/src/Ice/WSTransceiver.h @@ -29,7 +29,7 @@ class WSTransceiver : public Transceiver public: virtual NativeInfoPtr getNativeInfo(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual AsyncInfo* getAsyncInfo(SocketOperation); #endif @@ -38,7 +38,7 @@ public: virtual void close(); virtual SocketOperation write(Buffer&); virtual SocketOperation read(Buffer&); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual bool startWrite(Buffer&); virtual void finishWrite(Buffer&); virtual void startRead(Buffer&); diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index 8042fb8d195..ee8a05c4725 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -15,7 +15,7 @@ #include <IceSSL/OpenSSLTransceiverI.h> #include <IceSSL/SecureTransportTransceiverI.h> #include <IceSSL/SChannelTransceiverI.h> -#include <IceSSL/WinRTTransceiverI.h> +#include <IceSSL/UWPTransceiverI.h> #include <IceSSL/Util.h> @@ -34,7 +34,7 @@ IceSSL::AcceptorI::getNativeInfo() } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) IceInternal::AsyncInfo* IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status) { @@ -55,7 +55,7 @@ IceSSL::AcceptorI::listen() return _endpoint; } -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) void IceSSL::AcceptorI::startAccept() { diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h index 3ee5d5d2d4c..b71ef8ee46c 100644 --- a/cpp/src/IceSSL/AcceptorI.h +++ b/cpp/src/IceSSL/AcceptorI.h @@ -25,13 +25,13 @@ class AcceptorI : public IceInternal::Acceptor, public IceInternal::NativeInfo public: virtual IceInternal::NativeInfoPtr getNativeInfo(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual IceInternal::AsyncInfo* getAsyncInfo(IceInternal::SocketOperation); #endif virtual void close(); virtual IceInternal::EndpointIPtr listen(); -#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP) virtual void startAccept(); virtual void finishAccept(); #endif diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp index c0f7cb42589..97f2bd63365 100755 --- a/cpp/src/IceSSL/Certificate.cpp +++ b/cpp/src/IceSSL/Certificate.cpp @@ -28,7 +28,7 @@ # pragma GCC diagnostic ignored "-Wold-style-cast" #elif defined(ICE_USE_SECURE_TRANSPORT) # include <Security/Security.h> -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) # include <ppltasks.h> # include <nserror.h> #endif @@ -52,7 +52,7 @@ using namespace std; using namespace Ice; using namespace IceSSL; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP using namespace concurrency; using namespace Platform; using namespace Windows::Foundation; @@ -429,7 +429,7 @@ private: }; #endif -#elif defined(ICE_USE_SCHANNEL) || defined(ICE_OS_WINRT) +#elif defined(ICE_USE_SCHANNEL) || defined(ICE_OS_UWP) const Ice::Long TICKS_PER_MSECOND = 10000LL; const Ice::Long MSECS_TO_EPOCH = 11644473600000LL; @@ -1137,7 +1137,7 @@ Certificate::load(const string& file) } BIO_free(cert); return ICE_MAKE_SHARED(Certificate, x); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) promise<shared_ptr<Certificate>> result; create_task(StorageFile::GetFileFromApplicationUriAsync( ref new Uri(ref new String(stringToWstring(file).c_str())))).then([](StorageFile^ file) @@ -1241,7 +1241,7 @@ Certificate::decode(const string& encoding) } BIO_free(cert); return ICE_MAKE_SHARED(Certificate, x); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) string::size_type size, startpos, endpos = 0; startpos = encoding.find("-----BEGIN CERTIFICATE-----", endpos); if (startpos != string::npos) @@ -1275,7 +1275,7 @@ Certificate::operator==(const Certificate& other) const return CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, _certInfo, other._certInfo); #elif defined(ICE_USE_OPENSSL) return X509_cmp(_cert, other._cert) == 0; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) return CryptographicBuffer::Compare(_cert->GetCertificateBlob(), other._cert->GetCertificateBlob()); #else # error "Unknown platform" @@ -1305,7 +1305,7 @@ Certificate::getPublicKey() const return ICE_MAKE_SHARED(PublicKey, ICE_SHARED_FROM_CONST_THIS(Certificate), &_certInfo->SubjectPublicKeyInfo); #elif defined(ICE_USE_OPENSSL) return ICE_MAKE_SHARED(PublicKey, ICE_SHARED_FROM_CONST_THIS(Certificate), X509_get_pubkey(_cert)); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) return ICE_NULLPTR; // Not supported #else # error "Unknown platform" @@ -1433,7 +1433,7 @@ Certificate::verify(const CertificatePtr& cert) const return result; #elif defined(ICE_USE_OPENSSL) return X509_verify(_cert, cert->getPublicKey()->key()) > 0; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) return false; #else # error "Unknown platform" @@ -1519,7 +1519,7 @@ Certificate::encode() const string result = string(p->data, p->length); BIO_free(out); return result; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) auto reader = Windows::Storage::Streams::DataReader::FromBuffer(_cert->GetCertificateBlob()); std::vector<unsigned char> data(reader->UnconsumedBufferLength); if(!data.empty()) @@ -1572,7 +1572,7 @@ Certificate::getNotAfter() const return filetimeToTime(_certInfo->NotAfter); #elif defined(ICE_USE_OPENSSL) return ASMUtcTimeToTime(X509_get_notAfter(_cert)); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) // Convert 100ns time from January 1, 1601 to ms from January 1, 1970 IceUtil::Time time = IceUtil::Time::milliSeconds(_cert->ValidTo.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH); # ifdef ICE_CPP11_MAPPING @@ -1599,7 +1599,7 @@ Certificate::getNotBefore() const return filetimeToTime(_certInfo->NotBefore); #elif defined(ICE_USE_OPENSSL) return ASMUtcTimeToTime(X509_get_notBefore(_cert)); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) // Convert 100ns time from January 1, 1601 to ms from January 1, 1970 IceUtil::Time time = IceUtil::Time::milliSeconds(_cert->ValidFrom.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH); # ifdef ICE_CPP11_MAPPING @@ -1645,7 +1645,7 @@ Certificate::getSerialNumber() const BN_free(bn); return result; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) ostringstream os; os.fill(0); os.width(2); @@ -1671,7 +1671,7 @@ Certificate::getIssuerDN() const return DistinguishedName(certNameToString(&_certInfo->Issuer)); #elif defined(ICE_USE_OPENSSL) return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_issuer_name(_cert)))); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) ostringstream os; os << "CN=" << wstringToString(_cert->Issuer->Data()); return DistinguishedName(os.str()); @@ -1690,7 +1690,7 @@ Certificate::getIssuerAlternativeNames() return certificateAltNames(_certInfo, szOID_ISSUER_ALT_NAME2); #elif defined(ICE_USE_OPENSSL) return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_issuer_alt_name, 0, 0))); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) return vector<pair<int, string> >(); // Not supported #else # error "Unknown platform" @@ -1719,7 +1719,7 @@ Certificate::getSubjectDN() const return DistinguishedName(certNameToString(&_certInfo->Subject)); #elif defined(ICE_USE_OPENSSL) return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_subject_name(_cert)))); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) ostringstream os; os << "CN=" << wstringToString(_cert->Subject->Data()); return DistinguishedName(os.str()); @@ -1738,7 +1738,7 @@ Certificate::getSubjectAlternativeNames() return certificateAltNames(_certInfo, szOID_SUBJECT_ALT_NAME2); #elif defined(ICE_USE_OPENSSL) return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_subject_alt_name, 0, 0))); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) return certificateAltNames(_cert->SubjectAlternativeName); #else # error "Unknown platform" @@ -1758,7 +1758,7 @@ Certificate::getVersion() const return _certInfo->dwVersion; #elif defined(ICE_USE_OPENSSL) return static_cast<int>(X509_get_version(_cert)); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) return -1; // Not supported #else # error "Unknown platform" diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp index 1d2ee15efd2..67f6f082e1c 100644 --- a/cpp/src/IceSSL/ConnectorI.cpp +++ b/cpp/src/IceSSL/ConnectorI.cpp @@ -13,7 +13,7 @@ #include <IceSSL/OpenSSLTransceiverI.h> #include <IceSSL/SecureTransportTransceiverI.h> #include <IceSSL/SChannelTransceiverI.h> -#include <IceSSL/WinRTTransceiverI.h> +#include <IceSSL/UWPTransceiverI.h> #include <IceSSL/EndpointI.h> #include <IceSSL/Util.h> diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index b556be171c0..f4caa30fba0 100755 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -82,8 +82,8 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& com) _engine = new SecureTransportEngine(com); #elif defined(ICE_USE_SCHANNEL) _engine = new SChannelEngine(com); -#elif defined(ICE_OS_WINRT) - _engine = new WinRTEngine(com); +#elif defined(ICE_OS_UWP) + _engine = new UWPEngine(com); #else _engine = new OpenSSLEngine(com); #endif diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h index b0f61028c21..e896f52cc5a 100644 --- a/cpp/src/IceSSL/PluginI.h +++ b/cpp/src/IceSSL/PluginI.h @@ -51,8 +51,8 @@ private: SecureTransportEnginePtr _engine; #elif defined(ICE_USE_SCHANNEL) SChannelEnginePtr _engine; -#elif defined(ICE_OS_WINRT) - WinRTEnginePtr _engine; +#elif defined(ICE_OS_UWP) + UWPEnginePtr _engine; #else OpenSSLEnginePtr _engine; #endif diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h index 1ceca9e7b16..d9f1a87ca81 100644 --- a/cpp/src/IceSSL/SSLEngine.h +++ b/cpp/src/IceSSL/SSLEngine.h @@ -40,7 +40,7 @@ # include <sspi.h> # include <schannel.h> # undef SECURITY_WIN32 -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) # include <mutex> #endif @@ -225,13 +225,13 @@ private: std::vector<ALG_ID> _ciphers; }; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) -class WinRTEngine : public SSLEngine +class UWPEngine : public SSLEngine { public: - WinRTEngine(const Ice::CommunicatorPtr&); + UWPEngine(const Ice::CommunicatorPtr&); virtual void initialize(); virtual bool initialized() const; diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h index 1a5548aaf2b..70a75e74edb 100644 --- a/cpp/src/IceSSL/SSLEngineF.h +++ b/cpp/src/IceSSL/SSLEngineF.h @@ -30,10 +30,10 @@ typedef IceInternal::Handle<SecureTransportEngine> SecureTransportEnginePtr; class SChannelEngine; ICESSL_API IceUtil::Shared* upCast(SChannelEngine*); typedef IceInternal::Handle<SChannelEngine> SChannelEnginePtr; -#elif defined(ICE_OS_WINRT) -class WinRTEngine; -ICESSL_API IceUtil::Shared* upCast(WinRTEngine*); -typedef IceInternal::Handle<WinRTEngine> WinRTEnginePtr; +#elif defined(ICE_OS_UWP) +class UWPEngine; +ICESSL_API IceUtil::Shared* upCast(UWPEngine*); +typedef IceInternal::Handle<UWPEngine> UWPEnginePtr; #else // OpenSSL class OpenSSLEngine; ICESSL_API IceUtil::Shared* upCast(OpenSSLEngine*); diff --git a/cpp/src/IceSSL/WinRTEngine.cpp b/cpp/src/IceSSL/UWPEngine.cpp index 51cde970937..1619fa68f21 100755..100644 --- a/cpp/src/IceSSL/WinRTEngine.cpp +++ b/cpp/src/IceSSL/UWPEngine.cpp @@ -9,7 +9,7 @@ #include <IceSSL/Config.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP #include <IceSSL/SSLEngine.h> #include <Ice/Communicator.h> @@ -18,17 +18,17 @@ #include <string> -IceUtil::Shared* IceSSL::upCast(IceSSL::WinRTEngine* p) { return p; } +IceUtil::Shared* IceSSL::upCast(IceSSL::UWPEngine* p) { return p; } using namespace std; using namespace IceSSL; -WinRTEngine::WinRTEngine(const Ice::CommunicatorPtr& communicator) : SSLEngine(communicator) +UWPEngine::UWPEngine(const Ice::CommunicatorPtr& communicator) : SSLEngine(communicator) { } void -WinRTEngine::initialize() +UWPEngine::initialize() { lock_guard<mutex> lock(_mutex); if(_initialized) @@ -81,25 +81,25 @@ WinRTEngine::initialize() } bool -WinRTEngine::initialized() const +UWPEngine::initialized() const { return _initialized; } //shared_ptr<Certificate> -//WinRTEngine::ca() +//UWPEngine::ca() //{ // return _ca; //} shared_ptr<Certificate> -WinRTEngine::certificate() +UWPEngine::certificate() { return _certificate; } void -WinRTEngine::destroy() +UWPEngine::destroy() { } diff --git a/cpp/src/IceSSL/WinRTTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp index 2e974c1725d..bef7d0769b5 100755..100644 --- a/cpp/src/IceSSL/WinRTTransceiverI.cpp +++ b/cpp/src/IceSSL/UWPTransceiverI.cpp @@ -9,9 +9,9 @@ #include <IceSSL/Config.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP -#include <IceSSL/WinRTTransceiverI.h> +#include <IceSSL/UWPTransceiverI.h> #include <IceSSL/Instance.h> #include <IceSSL/SSLEngine.h> #include <Ice/Logger.h> @@ -370,7 +370,7 @@ IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance, const string& hostOrAdapterName, bool incoming) : _instance(instance), - _engine(WinRTEnginePtr::dynamicCast(instance->engine())), + _engine(UWPEnginePtr::dynamicCast(instance->engine())), _host(incoming ? "" : hostOrAdapterName), _adapterName(incoming ? hostOrAdapterName : ""), _incoming(incoming), diff --git a/cpp/src/IceSSL/WinRTTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h index 71429198022..6f1e7ef41fc 100755..100644 --- a/cpp/src/IceSSL/WinRTTransceiverI.h +++ b/cpp/src/IceSSL/UWPTransceiverI.h @@ -7,12 +7,12 @@ // // ********************************************************************** -#ifndef ICE_SSL_WINRT_TRANSCEIVER_I_H -#define ICE_SSL_WINRT_TRANSCEIVER_I_H +#ifndef ICE_SSL_UWP_TRANSCEIVER_I_H +#define ICE_SSL_UWP_TRANSCEIVER_I_H #include <IceSSL/Config.h> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP #include <IceSSL/InstanceF.h> #include <IceSSL/SSLEngineF.h> @@ -59,7 +59,7 @@ private: friend class AcceptorI; const InstancePtr _instance; - const WinRTEnginePtr _engine; + const UWPEnginePtr _engine; const std::string _host; const std::string _adapterName; const bool _incoming; diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index f6fd6a92563..f262d09979f 100755 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <IceUtil/Config.h> -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) # include <winsock2.h> #endif @@ -23,7 +23,7 @@ #include <Ice/StringConverter.h> #include <fstream> -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP # include <ppltasks.h> #endif @@ -40,7 +40,7 @@ using namespace Ice; using namespace IceUtil; using namespace IceSSL; -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP using namespace concurrency; using namespace Platform; using namespace Windows::Foundation; @@ -1692,7 +1692,7 @@ IceSSL::findCertificates(const string& location, const string& name, const strin } return certs; } -#elif defined (ICE_OS_WINRT) +#elif defined (ICE_OS_UWP) namespace { diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h index f10f5f25a72..fc6af1020cc 100644 --- a/cpp/src/IceSSL/Util.h +++ b/cpp/src/IceSSL/Util.h @@ -202,7 +202,7 @@ CFArrayRef findCertificateChain(const std::string&, const std::string&, const st #elif defined(ICE_USE_SCHANNEL) std::vector<PCCERT_CONTEXT> findCertificates(const std::string&, const std::string&, const std::string&, std::vector<HCERTSTORE>&); -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) Windows::Security::Cryptography::Certificates::Certificate^ importPersonalCertificate(const std::string&, std::function<std::string()>, bool, int); diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj index 2387a31de6f..318e38a3785 100644 --- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj @@ -147,8 +147,8 @@ <ClCompile Include="..\..\SSLEngine.cpp" /> <ClCompile Include="..\..\TrustManager.cpp" /> <ClCompile Include="..\..\Util.cpp" /> - <ClCompile Include="..\..\WinRTEngine.cpp" /> - <ClCompile Include="..\..\WinRTTransceiverI.cpp" /> + <ClCompile Include="..\..\UWPEngine.cpp" /> + <ClCompile Include="..\..\UWPTransceiverI.cpp" /> <ClCompile Include="ARM\Debug\ConnectionInfo.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters index e3eed3add57..2540bd3e82d 100644 --- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters +++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters @@ -129,7 +129,7 @@ <ClCompile Include="..\..\TrustManager.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\WinRTTransceiverI.cpp"> + <ClCompile Include="..\..\UWPTransceiverI.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\PluginI.cpp"> @@ -141,7 +141,7 @@ <ClCompile Include="..\..\Util.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\WinRTEngine.cpp"> + <ClCompile Include="..\..\UWPEngine.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\RFC2253.cpp"> diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp index 9da2b9bd3c5..6c7203d7c87 100644 --- a/cpp/src/IceUtil/FileUtil.cpp +++ b/cpp/src/IceUtil/FileUtil.cpp @@ -17,7 +17,7 @@ #ifdef _WIN32 # include <process.h> # include <io.h> -# ifndef ICE_OS_WINRT +# ifndef ICE_OS_UWP # include <Shlwapi.h> # endif #else @@ -96,7 +96,7 @@ IceUtilInternal::directoryExists(const string& path) // // Determine if a directory exists and is empty. // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP bool IceUtilInternal::isEmptyDirectory(const string& path) { @@ -245,7 +245,7 @@ IceUtilInternal::open(const string& path, int flags) } } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP int IceUtilInternal::getcwd(string& cwd) { @@ -291,7 +291,7 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) : // Don't need to use a wide string converter, the wide string is directly passed // to Windows API. // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP _fd = ::CreateFileW(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); #else diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp index f2f973d1f02..768c09471f0 100644 --- a/cpp/src/IceUtil/RecMutex.cpp +++ b/cpp/src/IceUtil/RecMutex.cpp @@ -33,7 +33,7 @@ IceUtil::RecMutex::RecMutex(const IceUtil::MutexProtocol protocol) : void IceUtil::RecMutex::init(const MutexProtocol) { -# ifdef ICE_OS_WINRT +# ifdef ICE_OS_UWP InitializeCriticalSectionEx(&_mutex, 0, 0); # else InitializeCriticalSection(&_mutex); diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index c59eebecbab..6c87d8d7148 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -816,7 +816,7 @@ IceUtilInternal::errorToString(int error, LPCVOID source) { if(error < WSABASEERR) { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP wstring lpMsgBuf(256, wchar_t()); DWORD stored = 0; @@ -881,7 +881,7 @@ IceUtilInternal::errorToString(int error, LPCVOID source) { result = result.substr(0, result.length() - 2); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(msg) { LocalFree(msg); diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp index 0df6a54238d..d01ddbb99b3 100644 --- a/cpp/src/IceUtil/UUID.cpp +++ b/cpp/src/IceUtil/UUID.cpp @@ -25,7 +25,7 @@ using namespace std; -#if defined(ICE_OS_WINRT) || !defined(_WIN32) +#if defined(ICE_OS_UWP) || !defined(_WIN32) namespace { @@ -92,7 +92,7 @@ inline void bytesToHex(unsigned char* bytes, size_t len, char*& hexBuffer) string IceUtil::generateUUID() { -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) UUID uuid; RPC_STATUS ret = UuidCreate(&uuid); diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 46873339daa..eb416b268ac 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -56,7 +56,7 @@ # endif #endif -#if defined(_WIN32) && !defined(ICE_OS_WINRT) && !defined(__MINGW32__) +#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__) # define ICE_DBGHELP # if defined(_MSC_VER) && (_MSC_VER >= 1700) # define DBGHELP_TRANSLATE_TCHAR diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 558c939d5ef..18cbd0d7e64 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -32,14 +32,14 @@ allTests(const CommunicatorPtr& communicator) test(obj == base); #endif cout << "ok" << endl; -#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 << "creating/destroying/recreating object adapter... " << flush; diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index bbe87980315..9f68051843c 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -368,9 +368,9 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP // - // This doesn't work well with WinRT because connection to localhost are + // This doesn't work well with UWP because connection to localhost are // restricted to the same process. // cout << "testing logger facet... " << flush; diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index cc6bc02cdd6..1ba9dec589b 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -950,7 +950,7 @@ allTests(const Ice::CommunicatorPtr& communicator) serverProps.push_back(localipv4); serverProps.push_back(localipv6); -#if defined(_WIN32) && !defined(ICE_OS_WINRT) +#if defined(_WIN32) && !defined(ICE_OS_UWP) OSVERSIONINFO ver; ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); # if defined(_MSC_VER) && _MSC_VER >= 1800 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; diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index fc9a76105ba..fd3299dcd38 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -22,10 +22,10 @@ class EmptyI : public virtual Empty GPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { -#ifdef ICE_OS_WINRT - bool winrt = true; +#ifdef ICE_OS_UWP + bool uwp = true; #else - bool winrt = false; + bool uwp = false; #endif cout << "testing Ice.Admin.Facets property... " << flush; @@ -64,7 +64,7 @@ allTests(const Ice::CommunicatorPtr& communicator) localOAEndpoint = ostr.str(); } communicator->getProperties()->setProperty("FacetExceptionTestAdapter.Endpoints", localOAEndpoint); - 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")) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter"); diff --git a/cpp/test/Ice/hash/Client.cpp b/cpp/test/Ice/hash/Client.cpp index fad164cee81..b1b0a373914 100644 --- a/cpp/test/Ice/hash/Client.cpp +++ b/cpp/test/Ice/hash/Client.cpp @@ -36,9 +36,9 @@ int main(int argc, char** argv) Ice::InitializationData id; id.properties = Ice::createProperties(argc, argv); -#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0 +#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0 // - // In Ice for WinRT IceSSL is part of Ice core. + // In Ice for UWP IceSSL is part of Ice core. // id.properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL"); id.properties->setProperty("IceSSL.Keychain", "client.keychain"); diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp index 542d3194e59..124b5069aad 100644 --- a/cpp/test/Ice/info/AllTests.cpp +++ b/cpp/test/Ice/info/AllTests.cpp @@ -66,7 +66,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(ipEndpoint->host == "tcphost"); test(ipEndpoint->port == 10000); test(ipEndpoint->timeout == 1200); -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) test(ipEndpoint->sourceAddress == "10.10.10.10"); #endif test(ipEndpoint->compress); @@ -85,7 +85,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(udpEndpoint); test(udpEndpoint->host == "udphost"); test(udpEndpoint->port == 10001); -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) test(udpEndpoint->sourceAddress == "10.10.10.10"); #endif test(udpEndpoint->mcastInterface == "eth0"); @@ -106,12 +106,12 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; string defaultHost = communicator->getProperties()->getProperty("Ice.Default.Host"); -#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 << "test object adapter endpoint information... " << flush; @@ -215,7 +215,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(info->remoteAddress == defaultHost); test(info->localAddress == defaultHost); } -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) test(info->rcvSize >= 1024); test(info->sndSize >= 2048); #endif @@ -246,7 +246,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { IceSSL::ConnectionInfoPtr wssinfo = ICE_DYNAMIC_CAST(IceSSL::ConnectionInfo, wsinfo->underlying); test(wssinfo->verified); -#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0 +#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0 test(!wssinfo->certs.empty()); #endif } @@ -277,7 +277,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(udpinfo->localAddress == defaultHost); } -#if !defined(ICE_OS_WINRT) +#if !defined(ICE_OS_UWP) test(udpinfo->rcvSize >= 2048); test(udpinfo->sndSize >= 1024); #endif diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 39ea56f9462..3a479e23436 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -689,15 +689,15 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) } cout << "ok" << endl; -#ifdef ICE_OS_WINRT - bool winrt = true; +#ifdef ICE_OS_UWP + bool uwp = true; #else - bool winrt = false; + bool uwp = false; #endif string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? "127.0.0.1" : "\"0:0:0:0:0:0:0:1\""; - 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")) { if(communicator->getProperties()->getProperty("Ice.Default.Host") == host) diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp index 3faea063c8d..59d31219482 100644 --- a/cpp/test/Ice/metrics/AllTests.cpp +++ b/cpp/test/Ice/metrics/AllTests.cpp @@ -467,10 +467,10 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt props["IceMX.Metrics.View.GroupBy"] = "none"; updateProps(clientProps, serverProps, update.get(), props); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP int threadCount = 4; #else - int threadCount = 3; // No endpoint host resolver thread with WinRT. + int threadCount = 3; // No endpoint host resolver thread with UWP. #endif Ice::Long timestamp; @@ -774,10 +774,10 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt cout << "ok" << endl; // - // Ice doesn't do any endpoint lookup with WinRT, the WinRT + // Ice doesn't do any endpoint lookup with UWP, the UWP // runtime takes care of if. // -#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0 +#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0 cout << "testing endpoint lookup metrics... " << flush; props["IceMX.Metrics.View.Map.EndpointLookup.GroupBy"] = "id"; @@ -1459,7 +1459,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt { test(obsv->connectionObserver->getTotal() > 0); test(obsv->connectionEstablishmentObserver->getTotal() > 0); -#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0 +#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0 test(obsv->endpointLookupObserver->getTotal() > 0); #endif test(obsv->invocationObserver->remoteObserver->getTotal() > 0); @@ -1476,7 +1476,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt { test(obsv->connectionObserver->getCurrent() > 0); test(obsv->connectionEstablishmentObserver->getCurrent() == 0); -#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0 +#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0 test(obsv->endpointLookupObserver->getCurrent() == 0); #endif waitForCurrent(obsv->invocationObserver->remoteObserver, 0); @@ -1499,7 +1499,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt { test(obsv->connectionObserver->getFailedCount() > 0); test(obsv->connectionEstablishmentObserver->getFailedCount() > 0); -#if !defined(ICE_OS_WINRT) && TARGET_OS_IPHONE==0 +#if !defined(ICE_OS_UWP) && TARGET_OS_IPHONE==0 test(obsv->endpointLookupObserver->getFailedCount() > 0); #endif } diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp index 4d37a3e2eaa..097b88c5fd2 100644 --- a/cpp/test/Ice/operations/Client.cpp +++ b/cpp/test/Ice/operations/Client.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&); Test::MyClassPrxPtr myClass = allTests(communicator); -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP myClass->shutdown(); cout << "testing server shutdown... " << flush; try diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index cce8c4cdbf8..6e8d963f798 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -1738,7 +1738,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) test(r == ctx); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(p->ice_getConnection() && communicator->getProperties()->getProperty("Ice.Default.Protocol") != "bt") { // diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 4731ece4dce..fbc1158d2e3 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -2456,7 +2456,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& #endif } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP if(p->ice_getConnection() && communicator->getProperties()->getProperty("Ice.Default.Protocol") != "bt") { // diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp index 2a677456bbe..69277632d4c 100644 --- a/cpp/test/Ice/plugin/Client.cpp +++ b/cpp/test/Ice/plugin/Client.cpp @@ -93,8 +93,8 @@ main(int argc, char* argv[]) // // Plugin directory is provided as the last argument // -#if defined(ICE_OS_WINRT) - string pluginDir = "plugins/winrt/"; +#if defined(ICE_OS_UWP) + string pluginDir = "plugins/uwp/"; #else string pluginDir = argv[argc - 1]; pluginDir += "/"; diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp index b9945f8d724..8356acbf1cf 100644 --- a/cpp/test/Ice/udp/AllTests.cpp +++ b/cpp/test/Ice/udp/AllTests.cpp @@ -149,7 +149,7 @@ allTests(const CommunicatorPtr& communicator) } base = communicator->stringToProxy("test -d:" + endpoint); TestIntfPrxPtr objMcast = ICE_UNCHECKED_CAST(TestIntfPrx, base); -#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || (defined(__APPLE__) && !TARGET_OS_IPHONE)) +#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || (defined(__APPLE__) && !TARGET_OS_IPHONE)) cout << "testing udp multicast... " << flush; nRetry = 5; diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index a7e28f9599d..735db704c75 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -21,7 +21,7 @@ # if TARGET_OS_IPHONE != 0 # include <IceSSL/Util.h> // For loadCertificateChain # endif -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) # include <ppltasks.h> # include <nserror.h> using namespace concurrency; @@ -75,7 +75,7 @@ readFile(const string& file, vector<char>& buffer) } } -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP // // Helper methods to install a remove certificates from the Application store. @@ -452,9 +452,9 @@ public: } // - // WinRT Certificate API doesn't provide the Issuer alternative name + // UWP Certificate API doesn't provide the Issuer alternative name // -# ifndef ICE_OS_WINRT +# ifndef ICE_OS_UWP // // Issuer alternative name // @@ -624,7 +624,7 @@ createClientProps(const Ice::PropertiesPtr& defaultProps, const string& defaultD Ice::PropertiesPtr properties; properties = createClientProps(defaultProps, defaultDir, defaultHost, p12); -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP // // Remove any CA certificates previously used by this test @@ -746,7 +746,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // // Anonymous cipher are not supported with SChannel or UWP // -#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_UWP) { InitializationData initData; initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12); @@ -903,7 +903,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) server = fact->createServer(d); try { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP IceSSL::CertificatePtr clientCert = IceSSL::Certificate::load("ms-appx:///c_rsa_ca1_pub.pem"); Ice::Context ctx; ctx["uwp"] = "1"; @@ -920,7 +920,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // // Validate some aspects of the Certificate class. // -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP IceSSL::CertificatePtr serverCert = IceSSL::Certificate::load("ms-appx:///s_rsa_ca1_pub.pem"); #else IceSSL::CertificatePtr serverCert = IceSSL::Certificate::load(defaultDir + "/s_rsa_ca1_pub.pem"); @@ -937,7 +937,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) # endif #endif -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP IceSSL::CertificatePtr caCert = IceSSL::Certificate::load("ms-appx:///cacert1.pem"); IceSSL::CertificatePtr caCert2 = IceSSL::Certificate::load("ms-appx:///cacert2.pem"); #else @@ -956,10 +956,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) #endif // - // IceSSL implementation for WinRT doesn't support to validate a certificate + // IceSSL implementation for UWP doesn't support to validate a certificate // with a custom CA. // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP test(!serverCert->verify(serverCert)); test(serverCert->verify(caCert)); test(!serverCert->verify(caCert2)); @@ -989,10 +989,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) #endif // - // IceSSL implementation for WinRT doesn't support to validate a certificate + // IceSSL implementation for UWP doesn't support to validate a certificate // with a custom CA. // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP test(info->nativeCerts[0]->verify(info->nativeCerts[1])); #endif test(info->nativeCerts.size() == 2 && @@ -1014,7 +1014,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) server = fact->createServer(d); try { -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP IceSSL::CertificatePtr clientCert = IceSSL::Certificate::load("ms-appx:///c_rsa_ca1_pub.pem"); Ice::Context ctx; ctx["uwp"] = "1"; @@ -1310,7 +1310,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) try { info = ICE_DYNAMIC_CAST(IceSSL::NativeConnectionInfo, server->ice_getConnection()->getInfo()); -#if defined(ICE_USE_SCHANNEL) || defined(ICE_OS_WINRT) +#if defined(ICE_USE_SCHANNEL) || defined(ICE_OS_UWP) test(info->nativeCerts.size() == 1); // SChannel never sends the root certificate #else test(info->nativeCerts.size() == 2); @@ -1358,10 +1358,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) comm->destroy(); // - // With WinRT the following tests that use an intermediate CA fails with + // With UWP the following tests that use an intermediate CA fails with // ChainValidationResult::IncompleteChain // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP // // Try certificate with one intermediate and VerifyDepthMax=2 // @@ -1541,7 +1541,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // // Anonymous ciphers are not supported with SChannel. // -#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_UWP) // // ADH is allowed but will not have a certificate. // @@ -1660,9 +1660,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) cout << "ok" << endl; // - // IceSSL.Protocols is not supported with WinRT + // IceSSL.Protocols is not supported with UWP // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP cout << "testing protocols... " << flush; { # ifndef ICE_USE_SECURE_TRANSPORT @@ -1947,7 +1947,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 { -# ifdef ICE_OS_WINRT +# ifdef ICE_OS_UWP IceSSL::CertificatePtr cert = IceSSL::Certificate::load("ms-appx:///s_rsa_ca1_exp_pub.pem"); # else IceSSL::CertificatePtr cert = IceSSL::Certificate::load(defaultDir + "/s_rsa_ca1_exp_pub.pem"); @@ -1985,7 +1985,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0 { -# ifdef ICE_OS_WINRT +# ifdef ICE_OS_UWP IceSSL::CertificatePtr cert = IceSSL::Certificate::load("ms-appx:///c_rsa_ca1_exp_pub.pem"); # else IceSSL::CertificatePtr cert = IceSSL::Certificate::load(defaultDir + "/c_rsa_ca1_exp_pub.pem"); @@ -2051,9 +2051,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) #endif // - // IceSSL.CAs is not supported with WinRT + // IceSSL.CAs is not supported with UWP // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP cout << "testing multiple CA certificates... " << flush; { InitializationData initData; @@ -2080,9 +2080,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) #endif // - // OpenSSL must use PEM certificate, WinRT doesn't support IceSSL.CAs + // OpenSSL must use PEM certificate, UWP doesn't support IceSSL.CAs // -#if !defined(ICE_USE_OPENSSL) && !defined(ICE_OS_WINRT) +#if !defined(ICE_USE_OPENSSL) && !defined(ICE_OS_UWP) cout << "testing DER CA certificate... " << flush; { InitializationData initData; @@ -2158,7 +2158,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // // Use an incorrect password and check that retries are attempted. // -#ifdef ICE_OS_WINRT +#ifdef ICE_OS_UWP removePersonalCertificate(); #endif initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_pass_ca1", "cacert1"); @@ -2199,9 +2199,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) #endif // - // IceSSL.Ciphers is not implemented with WinRT + // IceSSL.Ciphers is not implemented with UWP // -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP cout << "testing ciphers... " << flush; # ifndef ICE_USE_SCHANNEL { @@ -2593,9 +2593,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) cout << "testing IceSSL.TrustOnly... " << flush; // - // WinRT only provides the Subject and Issuer CN and not the full Subject and Issuer DNs, + // UWP only provides the Subject and Issuer CN and not the full Subject and Issuer DNs, // this implies that we can only do a limited range of checks with IceSSL.TrustOnly -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP // // iOS support only provides access to the CN of the certificate so we // can't check for other attributes @@ -2840,7 +2840,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) comm->destroy(); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP { InitializationData initData; initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1"); @@ -3022,7 +3022,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) comm->destroy(); } -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP { // // Rejection takes precedence (client). @@ -3076,7 +3076,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) cout << "ok" << endl; cout << "testing IceSSL.TrustOnly.Client... " << flush; -#ifndef ICE_OS_WINRT +#ifndef ICE_OS_UWP { InitializationData initData; initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1"); @@ -3532,7 +3532,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) } } cout << "ok" << endl; -#elif defined(ICE_OS_WINRT) +#elif defined(ICE_OS_UWP) cout << "testing IceSSL.FindCert... " << flush; const char* clientFindCertProperties[] = { @@ -3758,10 +3758,10 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) #endif } -#if !defined(_AIX) && !defined(ICE_OS_WINRT) +#if !defined(_AIX) && !defined(ICE_OS_UWP) // On AIX 6.1, the default root certificates don't validate demo.zeroc.com - // WinRT application manifest is not configure to use system CAs and IceSSL.UsePlatformCAs - // is not supported with WinRT + // UWP application manifest is not configure to use system CAs and IceSSL.UsePlatformCAs + // is not supported with UWP cout << "testing system CAs... " << flush; { { diff --git a/cpp/test/IceSSL/configuration/Client.cpp b/cpp/test/IceSSL/configuration/Client.cpp index 765122fd874..631cefff11e 100644 --- a/cpp/test/IceSSL/configuration/Client.cpp +++ b/cpp/test/IceSSL/configuration/Client.cpp @@ -35,7 +35,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { cerr << "testing with PKCS12 certificates..." << endl; Test::ServerFactoryPrxPtr factory = allTests(communicator, testdir, true); -#if TARGET_OS_IPHONE == 0 && !defined(ICE_OS_WINRT) +#if TARGET_OS_IPHONE == 0 && !defined(ICE_OS_UWP) cerr << "testing with PEM certificates..." << endl; factory = allTests(communicator, testdir, false); #endif diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h index e9c34484361..de0ef4c7f61 100644 --- a/cpp/test/include/TestCommon.h +++ b/cpp/test/include/TestCommon.h @@ -20,7 +20,7 @@ #include <Ice/ProxyF.h> #include <Ice/Initialize.h> -#if defined(ICE_OS_WINRT) || (TARGET_OS_IPHONE != 0) +#if defined(ICE_OS_UWP) || (TARGET_OS_IPHONE != 0) # include <Ice/Initialize.h> # include <Ice/Logger.h> # include <Ice/LocalException.h> @@ -57,7 +57,7 @@ TEST_API std::string getTestHost(const Ice::PropertiesPtr&); TEST_API int getTestPort(const Ice::PropertiesPtr&, int); TEST_API Ice::InitializationData getTestInitData(int&, char*[]); -#if !defined(ICE_OS_WINRT) && (TARGET_OS_IPHONE == 0) +#if !defined(ICE_OS_UWP) && (TARGET_OS_IPHONE == 0) void inline testFailed(const char* expr, const char* file, unsigned int line) diff --git a/cpp/test/uwp/MainPage.xaml b/cpp/test/uwp/MainPage.xaml index 23aea94ff2c..7f596764265 100644 --- a/cpp/test/uwp/MainPage.xaml +++ b/cpp/test/uwp/MainPage.xaml @@ -71,7 +71,7 @@ x:Name="Language" SelectedIndex="0" SelectionChanged="Language_SelectionChanged"> - <ComboBoxItem Name="winrt">winrt</ComboBoxItem> + <ComboBoxItem Name="uwp">UWP</ComboBoxItem> <ComboBoxItem Name="cpp">C++</ComboBoxItem> <ComboBoxItem Name="csharp">C#</ComboBoxItem> <ComboBoxItem Name="java">Java</ComboBoxItem> diff --git a/cpp/test/uwp/MainPage.xaml.cpp b/cpp/test/uwp/MainPage.xaml.cpp index 5a2ad8c9dc8..fcb16d1c9a2 100644 --- a/cpp/test/uwp/MainPage.xaml.cpp +++ b/cpp/test/uwp/MainPage.xaml.cpp @@ -169,7 +169,7 @@ vector<TestSuiteDesc> allTests(string remoteServerLang) { "Ice/timeout" }, }; - if(remoteServerLang == "winrt") + if(remoteServerLang == "uwp") { all.push_back({ "Ice/metrics", { { "client/server" }, @@ -544,7 +544,7 @@ TestRunner::run() assert(!p->client.empty()); if(!p->server.empty()) { - if(_config.mapping == "winrt") + if(_config.mapping == "uwp") { runClientServerTest(*p); } @@ -792,7 +792,7 @@ MainPage::completed() { _testSuites->IsEnabled = true; _protocol->IsEnabled = true; - if(selectedLanguage() != "winrt") + if(selectedLanguage() != "uwp") { _host->IsEnabled = true; } @@ -887,7 +887,7 @@ void TestSuite::MainPage::initializeSupportedProtocols() { _protocols->Clear(); - if(selectedLanguage() == "winrt") + if(selectedLanguage() == "uwp") { _protocols->Append("tcp"); _protocols->Append("ws"); @@ -907,7 +907,7 @@ TestSuite::MainPage::initializeSupportedProtocols() std::string TestSuite::MainPage::selectedProtocol() { - if(selectedLanguage() == "winrt") + if(selectedLanguage() == "uwp") { const char* protocols[] = { "tcp", "ws" }; assert(_protocol->SelectedIndex < sizeof(protocols) / sizeof(const char*)); @@ -923,7 +923,7 @@ TestSuite::MainPage::selectedProtocol() std::string TestSuite::MainPage::selectedLanguage() { - static const char* languages[] = {"winrt", "cpp", "csharp", "java"}; + static const char* languages[] = {"uwp", "cpp", "csharp", "java"}; assert(_language->SelectedIndex < sizeof(languages) / sizeof(const char*)); return languages[_language->SelectedIndex]; } @@ -933,7 +933,7 @@ TestSuite::MainPage::Language_SelectionChanged(Platform::Object^ sender, Selecti { if(_language) { - _host->IsEnabled = selectedLanguage() != "winrt"; + _host->IsEnabled = selectedLanguage() != "uwp"; initializeSupportedTests(); initializeSupportedProtocols(); } |