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/src/IceUtil | |
| 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/src/IceUtil')
| -rw-r--r-- | cpp/src/IceUtil/FileUtil.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceUtil/RecMutex.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/StringUtil.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceUtil/UUID.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceUtil/UtilException.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
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 |