generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-12-08 03:57:21 +01:00
Code Issues Projects Releases Wiki Activity

- fix of the Timer fix from rev. 1953

Browse Source 
- improved UTFString definitions
- allow empty Glob (testMatchEmptyPattern() failing)
- fixed SF#3535990: POCO_HAVE_IPv6 without POCO_WIN32_UTF8 conflict
This commit is contained in:
Aleksandar Fabijanic
2012-08-18 21:09:50 +00:00
parent e4baf46d7b
commit 88134859e4
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Foundation/include/Poco/UTFString.h
View File

@@ -48,13 +48,19 @@ namespace Poco {
// UTF string types
#ifndef POCO_NO_WSTRING
//#if defined(POCO_ENABLE_CPP11) //TODO
//#if defined(POCO_ENABLE_CPP11) //TODO
// typedef char16_t UTF16Char;
// typedef std::u16string UTF16String;
// typedef char32_t UTF32Char;
// typedef std::u32string UTF32String;
//#else
//#else
#ifdef POCO_NO_WSTRING
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UInt16> UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UInt32> UTF32String;
#else // POCO_NO_WSTRING
#if defined(POCO_OS_FAMILY_WINDOWS)
typedef wchar_t UTF16Char;
typedef std::wstring UTF16String;
@@ -78,9 +84,8 @@ namespace Poco {
typedef wchar_t UTF32Char;
typedef std::wstring UTF32String;
#endif //POCO_OS_FAMILY_WINDOWS
//#endif // POCO_ENABLE_CPP11
#endif //POCO_NO_WSTRING
#endif //POCO_NO_WSTRING
//#endif // POCO_ENABLE_CPP11
} // namespace Poco