From 15498808faf4c811d4fac14e2f2d0f204932eba2 Mon Sep 17 00:00:00 2001 From: ExMix Date: Mon, 4 Aug 2014 11:24:55 +0300 Subject: [PATCH] review fix --- drape_frontend/stylist.cpp | 2 +- drape_frontend/stylist.hpp | 2 +- geometry/spline.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp index 45b8d9d66d..fa5c471ec1 100644 --- a/drape_frontend/stylist.cpp +++ b/drape_frontend/stylist.cpp @@ -218,7 +218,7 @@ string const & CaptionDescription::GetRoadNumber() const return m_roadNumber; } -string CaptionDescription::GetPathNumber() const +string CaptionDescription::GetPathName() const { // Always concat names for linear features because we process only one draw rule now. if (m_mainText.empty()) diff --git a/drape_frontend/stylist.hpp b/drape_frontend/stylist.hpp index d3bdf4e168..5d89123a98 100644 --- a/drape_frontend/stylist.hpp +++ b/drape_frontend/stylist.hpp @@ -28,7 +28,7 @@ struct CaptionDescription string const & GetMainText() const; string const & GetAuxText() const; string const & GetRoadNumber() const; - string GetPathNumber() const; + string GetPathName() const; double GetPopulationRank() const; bool IsNameExists() const; diff --git a/geometry/spline.cpp b/geometry/spline.cpp index 4e2af5b770..6f80369f20 100644 --- a/geometry/spline.cpp +++ b/geometry/spline.cpp @@ -79,12 +79,14 @@ SharedSpline::SharedSpline(vector const & path) SharedSpline::SharedSpline(SharedSpline const & other) { - m_spline = other.m_spline; + if (this != &other) + m_spline = other.m_spline; } SharedSpline const & SharedSpline::operator= (SharedSpline const & spl) { - m_spline = spl.m_spline; + if (this != &spl) + m_spline = spl.m_spline; return *this; }