linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2155
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Thu 2010-05-27 00:15:40 +0200
message:
  fix a chat crash with VS (it doesn't convert the literal to a string object)
modified:
  dwt/src/widgets/RichTextBox.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dwt/src/widgets/RichTextBox.cpp'
--- dwt/src/widgets/RichTextBox.cpp	2010-03-26 17:15:26 +0000
+++ dwt/src/widgets/RichTextBox.cpp	2010-05-26 22:15:40 +0000
@@ -289,7 +289,7 @@
 std::string RichTextBox::escapeUnicode(const tstring& str) {
 	std::string ret;
 	boost::find_format_all_copy(std::back_inserter(ret), str,
-		boost::first_finder(L"\x7f", std::greater<TCHAR>()), unicodeEscapeFormatter);
+		boost::first_finder(tstring(_T("\x7f")), std::greater<TCHAR>()), unicodeEscapeFormatter);
 	return ret;
 }
 
@@ -306,7 +306,7 @@
 	using boost::lambda::_1;
 	tstring escaped;
 	boost::find_format_all_copy(std::back_inserter(escaped), str,
-		boost::first_finder(L"\x7f", _1 == '{' || _1 == '}' || _1 == '\\' || _1 == '\n' || _1 == '\r'), rtfEscapeFormatter);
+		boost::first_finder(tstring(_T("\x7f")), _1 == '{' || _1 == '}' || _1 == '\\' || _1 == '\n' || _1 == '\r'), rtfEscapeFormatter);
 	return escaped;
 }