Linux fixes for UnicodeConverter

This commit is contained in:
Aleksandar Fabijanic
2012-08-02 05:01:00 +00:00
parent 416cc7a630
commit 0bcf08b3f7
4 changed files with 15 additions and 12 deletions

View File

@@ -18,14 +18,14 @@
// execute, and transmit the Software, and to prepare derivative works of the
// Software, and to permit third-parties to whom the Software is furnished to
// do so, all subject to the following:
//
//
// The copyright notices in the Software and this entire statement, including
// the above license grant, this restriction and the following disclaimer,
// must be included in all copies of the Software, in whole or in part, and
// all derivative works of the Software, unless such copies or derivative
// works are solely in the form of machine-executable object code generated by
// a source language processor.
//
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
@@ -67,9 +67,9 @@ namespace Poco {
typedef UInt32 UTF32Char;
typedef std::basic_string<UInt32> UTF32String;
#elif (__SIZEOF_WCHAR_T__ == 4)
typedef Poco::Uint16 UTF16Char;
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UInt16> UTF16String;
typedef UInt32 UTF32Char;
typedef wchar_t UTF32Char;
typedef std::wstring UTF32String;
#endif
#else // default to 32-bit wchar_t
@@ -79,7 +79,7 @@ namespace Poco {
typedef std::wstring UTF32String;
#endif //POCO_OS_FAMILY_WINDOWS
//#endif // POCO_ENABLE_CPP11
#endif POCO_NO_WSTRING
#endif //POCO_NO_WSTRING
} // namespace Poco