From d68668631989e6200fe55638d8d4808f4456c6a1 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Fri, 26 May 2017 17:41:27 +0300
Subject: Removed conditional compilation from debug rect renderer

---
 drape/overlay_tree.hpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'drape/overlay_tree.hpp')

diff --git a/drape/overlay_tree.hpp b/drape/overlay_tree.hpp
index 30db970360..02ec201506 100644
--- a/drape/overlay_tree.hpp
+++ b/drape/overlay_tree.hpp
@@ -14,10 +14,8 @@
 
 namespace dp
 {
-
 namespace detail
 {
-
 struct OverlayTraits
 {
   ScreenBase m_modelView;
@@ -37,8 +35,7 @@ struct OverlayHasher
     return m_hasher(handle.get());
   }
 };
-
-}
+}  // namespace detail
 
 using TOverlayContainer = buffer_vector<ref_ptr<OverlayHandle>, 8>;
 
@@ -70,19 +67,18 @@ public:
   void SetSelectedFeature(FeatureID const & featureID);
   bool GetSelectedFeatureRect(ScreenBase const & screen, m2::RectD & featureRect);
 
-#ifdef COLLECT_DISPLACEMENT_INFO
   struct DisplacementData
   {
     m2::PointF m_arrowStart;
     m2::PointF m_arrowEnd;
     dp::Color m_arrowColor;
-    DisplacementData(m2::PointF const & arrowStart, m2::PointF const & arrowEnd, dp::Color const & arrowColor)
+    DisplacementData(m2::PointF const & arrowStart, m2::PointF const & arrowEnd,
+                     dp::Color const & arrowColor)
       : m_arrowStart(arrowStart), m_arrowEnd(arrowEnd), m_arrowColor(arrowColor)
     {}
   };
-  using TDisplacementInfo = vector<DisplacementData>;
+  using TDisplacementInfo = std::vector<DisplacementData>;
   TDisplacementInfo const & GetDisplacementInfo() const;
-#endif
 
 private:
   ScreenBase const & GetModelView() const { return m_traits.m_modelView; }
@@ -104,9 +100,6 @@ private:
 
   FeatureID m_selectedFeatureID;
 
-#ifdef COLLECT_DISPLACEMENT_INFO
   TDisplacementInfo m_displacementInfo;
-#endif
 };
-
-} // namespace dp
+}  // namespace dp
-- 
cgit v1.2.3