version 0.3.28
[fms.git] / src / unicode / unicodeformatter.cpp
index c89cc7c..bc6a238 100644 (file)
@@ -2,7 +2,7 @@
 #include "../../include/unicode/utfconversion.h"\r
 \r
 std::wstring UnicodeFormatter::m_unicodenewline=L"\n";\r
-wchar_t UnicodeFormatter::m_unicodewhitespace[]={0x0009,0x000A,0x000B,0x000C,0x000D,\r
+std::wstring::value_type UnicodeFormatter::m_unicodewhitespace[]={0x0009,0x000A,0x000B,0x000C,0x000D,\r
                                                                                                0x0020,0x0085,0x00A0,0x1680,0x180E,\r
                                                                                                0x2000,0x2001,0x2002,0x2003,0x2004,\r
                                                                                                0x2005,0x2006,0x2007,0x2008,0x2009,\r
@@ -11,8 +11,8 @@ wchar_t UnicodeFormatter::m_unicodewhitespace[]={0x0009,0x000A,0x000B,0x000C,0x0
 \r
 const bool UnicodeFormatter::LineWrap(const std::string &utf8input, const int linelength, const std::string &ignorechars, std::string &utf8output)\r
 {\r
-       std::wstring wcstring;\r
-       std::wstring wcignorechars;\r
+       std::wstring wcstring=L"";\r
+       std::wstring wcignorechars=L"";\r
 \r
        if(UTFConversion::FromUTF8(utf8input,wcstring) && UTFConversion::FromUTF8(ignorechars,wcignorechars))\r
        {\r