Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2017-05-26 17:41:27 +0300
committerr.kuznetsov <r.kuznetsov@corp.mail.ru>2017-05-26 18:14:10 +0300
commitd68668631989e6200fe55638d8d4808f4456c6a1 (patch)
tree5afc3baaa933de73023e7931351e5d23ac2dec1c /drape/overlay_tree.hpp
parent32bce6ea7fc666d0101cc059a10a911b94e114e6 (diff)
Removed conditional compilation from debug rect renderer
Diffstat (limited to 'drape/overlay_tree.hpp')
-rw-r--r--drape/overlay_tree.hpp17
1 files changed, 5 insertions, 12 deletions
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