Output debug priorities as hex numbers

3 files changed, 16 insertions, 14 deletions

diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp
index 15f8556c7b..d6a6e6a4e7 100644
--- a/drape/overlay_handle.cpp
+++ b/drape/overlay_handle.cpp
@@ -8,6 +8,7 @@
 #include "base/logging.hpp"
 
 #include <algorithm>
+#include <ios>
 #include <sstream>
 
 namespace dp
@@ -248,7 +249,7 @@ bool SquareHandle::IsBound() const { return m_isBound; }
 std::string SquareHandle::GetOverlayDebugInfo()
 {
   std::ostringstream out;
-  out << "POI Priority(" << GetPriority() << ") "
+  out << "POI Priority(" << std::hex << GetPriority() << ") " << std::dec
       << GetOverlayID().m_featureId.m_index << "-" << GetOverlayID().m_index << " "
       << m_debugStr;
   return out.str();
diff --git a/drape_frontend/text_handle.cpp b/drape_frontend/text_handle.cpp
index 7177b66600..e09b7d30e2 100644
--- a/drape_frontend/text_handle.cpp
+++ b/drape_frontend/text_handle.cpp
@@ -4,9 +4,11 @@
 
 #include "base/logging.hpp"
 
+#include <ios>
+#include <sstream>
+
 namespace df
 {
-
 TextHandle::TextHandle(dp::OverlayID const & id, strings::UniString const & text,
                        dp::Anchor anchor, uint64_t priority, int fixedHeight,
                        ref_ptr<dp::TextureManager> textureManager,
@@ -80,13 +82,13 @@ void TextHandle::SetForceUpdateNormals(bool forceUpdate) const
 }
 
 #ifdef DEBUG_OVERLAYS_OUTPUT
-string TextHandle::GetOverlayDebugInfo()
+std::string TextHandle::GetOverlayDebugInfo()
 {
-  ostringstream out;
-  out << "Text Priority(" << GetPriority() << ") " << GetOverlayID().m_featureId.m_index
-      << "-" << GetOverlayID().m_index << " " << strings::ToUtf8(m_text);
+  std::ostringstream out;
+  out << "Text Priority(" << std::hex << GetPriority() << ") " << std::dec
+      << GetOverlayID().m_featureId.m_index << "-" << GetOverlayID().m_index << " "
+      << strings::ToUtf8(m_text);
   return out.str();
 }
 #endif
-
-} // namespace df
+}  // namespace df
diff --git a/drape_frontend/text_handle.hpp b/drape_frontend/text_handle.hpp
index 8d8cd8456c..05545baa3f 100644
--- a/drape_frontend/text_handle.hpp
+++ b/drape_frontend/text_handle.hpp
@@ -6,14 +6,15 @@
 
 #include "base/string_utils.hpp"
 
+#include <string>
+
 namespace dp
 {
-  class TextureManager;
+class TextureManager;
 }
 
 namespace df
 {
-
 class TextHandle : public dp::OverlayHandle
 {
 public:
@@ -37,7 +38,7 @@ public:
   void SetForceUpdateNormals(bool forceUpdate) const;
 
 #ifdef DEBUG_OVERLAYS_OUTPUT
-  virtual string GetOverlayDebugInfo() override;
+  virtual std::string GetOverlayDebugInfo() override;
 #endif
 
 protected:
@@ -52,6 +53,4 @@ private:
   bool m_glyphsReady;
   int m_fixedHeight;
 };
-
-
-} // namespace df
+}  // namespace df