kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Process DebugPrint(string const &) like UTF8 for Unix systems (cerr accepts them well).

Browse source
This commit is contained in:
vng 2014-01-22 18:12:47 +03:00 • committed by Alex Zolotarev
parent 8e6b39e091
commit bcba3d9906
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
base/internal/message.cpp
View file

@ -2,22 +2,27 @@
string DebugPrint(string const & t)
{
// string res;
// res.push_back('\'');
// for (string::const_iterator it = t.begin(); it != t.end(); ++it)
// {
// static char const toHex[] = "0123456789abcdef";
// unsigned char const c = static_cast<unsigned char>(*it);
// if (c >= ' ' && c <= '~')
// res.push_back(*it);
// else
// {
// res.push_back('\\');
// res.push_back(toHex[c >> 4]);
// res.push_back(toHex[c & 0xf]);
// }
// }
// res.push_back('\'');
// Simply print UTF-8 string. Our computers (finally) supports it.
#ifdef OMIM_OS_WINDOWS
string res;
res.push_back('\'');
for (string::const_iterator it = t.begin(); it != t.end(); ++it)
{
static char const toHex[] = "0123456789abcdef";
unsigned char const c = static_cast<unsigned char>(*it);
if (c >= ' ' && c <= '~')
res.push_back(*it);
else
{
res.push_back('\\');
res.push_back(toHex[c >> 4]);
res.push_back(toHex[c & 0xf]);
}
}
res.push_back('\'');
return res;
#else
// Assume like UTF8 string.
return t;
#endif
}

6
base/internal/message.hpp
View file

@ -51,9 +51,9 @@ inline string DebugPrint(unsigned char t)
template <typename U, typename V> inline string DebugPrint(pair<U,V> const & p)
{
ostringstream out;
out << "(" << DebugPrint(p.first) << ", " << DebugPrint(p.second) << ")";
return out.str();
ostringstream out;
out << "(" << DebugPrint(p.first) << ", " << DebugPrint(p.second) << ")";
return out.str();
}
namespace my