cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 3d66b7efd1c23d3b8d9762ed84ef2ec64f613c40..a3270e355d15b748f7f8ea15991323e9a7508e96 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -73,9 +73,9 @@ string const LyXLex::Pimpl::getString() const
 
 lyx::docstring const LyXLex::Pimpl::getDocString() const
 {
-        std::vector<boost::uint32_t> res = utf8_to_ucs4(buff);
-        lyx::docstring dstr(res.begin(), res.end());
-        return dstr;
+       std::vector<lyx::char_type> res = utf8_to_ucs4(buff);
+       lyx::docstring dstr(res.begin(), res.end());
+       return dstr;
 }
 
 
@@ -83,7 +83,7 @@ void LyXLex::Pimpl::printError(string const & message) const
 {
        string const tmpmsg = subst(message, "$$Token", getString());
        lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
-              << " of file " << makeDisplayPath(name) << ']' << endl;
+               << " of file " << lyx::to_utf8(makeDisplayPath(name)) << ']' << endl;
 }