From bcba3d99066e5ec8433b457cc4e794c0f4b5df7d Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Wed, 22 Jan 2014 18:12:47 +0300
Subject: [PATCH] Process DebugPrint(string const &) like UTF8 for Unix systems
 (cerr accepts them well).

---
 base/internal/message.cpp | 39 ++++++++++++++++++++++-----------------
 base/internal/message.hpp |  6 +++---
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/base/internal/message.cpp b/base/internal/message.cpp
index 9ad3655788..8c468f382a 100644
--- a/base/internal/message.cpp
+++ b/base/internal/message.cpp
@@ -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
 }
diff --git a/base/internal/message.hpp b/base/internal/message.hpp
index 84c297be88..27377a5323 100644
--- a/base/internal/message.hpp
+++ b/base/internal/message.hpp
@@ -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