[core] Fix minor warnings

Signed-off-by: Konstantin Pastbin <[email protected]>
thegrasshopper104 · Sep 15, 2023 · 3d2b998 · 3d2b998
1 parent ea37cc3
commit 3d2b998
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 9 deletions.
diff --git a/base/non_intersecting_intervals.hpp b/base/non_intersecting_intervals.hpp
@@ -76,7 +76,7 @@ bool NonIntersectingIntervals<T>::Interval::LessByLeftEnd::operator()(Interval c
                                                                       Interval const & rhs) const
 {
   return lhs.m_left < rhs.m_left;
-};
+}
 
 template <typename T>
 bool NonIntersectingIntervals<T>::Interval::Intersects(Interval const & rhs) const

diff --git a/drape/oglcontext.cpp b/drape/oglcontext.cpp
@@ -191,7 +191,7 @@ void OGLContext::SetDepthTestEnabled(bool enabled)
 void OGLContext::SetDepthTestFunction(TestFunction depthFunction)
 {
   GLFunctions::glDepthFunc(DecodeTestFunction(depthFunction));
-};
+}
 
 void OGLContext::SetStencilTestEnabled(bool enabled)
 {

diff --git a/drape_frontend/gui/skin.cpp b/drape_frontend/gui/skin.cpp
@@ -37,7 +37,9 @@ dp::Anchor ParseValueAnchor(std::string_view value)
   if (value == "bottom")
     return dp::Bottom;
   else
+  {
     ASSERT(false, ());
+  }
 
   return dp::Center;
 }
@@ -94,7 +96,9 @@ class ResolverParser
       else if (m_element == Element::Relative)
         m_resolver.AddRelative(ParseValueAnchor(value));
       else
+      {
         ASSERT(false, ());
+      }
     }
   }
 
@@ -140,14 +144,18 @@ class SkinLoader
       else if (element == "copyright")
         m_currentElement = WIDGET_COPYRIGHT;
       else
+      {
         ASSERT(false, ());
+      }
     }
     else if (!m_inConfiguration)
     {
       if (element == "portrait" || element == "landscape")
         m_inConfiguration = true;
       else
+      {
         ASSERT(false, ());
+      }
     }
     else
     {
@@ -158,7 +166,9 @@ class SkinLoader
       else if (element == "offset")
         m_parser.SetElement(ResolverParser::Element::Offset);
       else
+      {
         ASSERT(false, ());
+      }
     }
 
     return true;

diff --git a/drape_frontend/line_shape_helper.cpp b/drape_frontend/line_shape_helper.cpp
@@ -90,7 +90,9 @@ void ConstructLineSegments(std::vector<m2::PointD> const & path, std::vector<gls
   ASSERT_LESS(1, path.size(), ());
 
   if (!segmentsColors.empty())
+  {
     ASSERT_EQUAL(segmentsColors.size() + 1, path.size(), ());
+  }
 
   m2::PointD prevPoint = path[0];
   for (size_t i = 1; i < path.size(); ++i)

diff --git a/generator/restriction_writer.cpp b/generator/restriction_writer.cpp
@@ -71,7 +71,7 @@ std::vector<RelationElement::Member> GetMembersByTag(RelationElement const & rel
   }
 
   return result;
-};
+}
 
 OsmElement::EntityType GetType(RelationElement const & relationElement, uint64_t osmId)
 {
@@ -88,7 +88,7 @@ OsmElement::EntityType GetType(RelationElement const & relationElement, uint64_t
   }
 
   UNREACHABLE();
-};
+}
 
 std::string const RestrictionWriter::kNodeString = "node";
 std::string const RestrictionWriter::kWayString = "way";

diff --git a/geometry/rect2d.hpp b/geometry/rect2d.hpp
@@ -358,7 +358,7 @@ bool HasIntersection(m2::Rect<T> const & rect, TCollection const & geometry)
       return true;
   }
   return false;
-};
+}
 
 template <class TArchive, class PointT>
 TArchive & operator>>(TArchive & ar, m2::Rect<PointT> & rect)

diff --git a/indexer/feature.cpp b/indexer/feature.cpp
@@ -362,7 +362,9 @@ void FeatureType::ParseHeader2()
     if (elemsCount == 0)
       geomScalesMask = bitSource.Read(4);
     else
+    {
       ASSERT(headerGeomType == HeaderGeomType::Area || elemsCount > 1, ());
+    }
   }
 
   ArrayByteSource src(bitSource.RoundPtr());
@@ -833,7 +835,9 @@ string_view FeatureType::GetName(int8_t lang)
   // We don't store empty names. UPD: We do for coast features :)
   string_view name;
   if (m_params.name.GetString(lang, name))
+  {
     ASSERT(!name.empty() || m_id.m_mwmId.GetInfo()->GetType() == MwmInfo::COASTS, ());
+  }
 
   return name;
 }

diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp
@@ -528,7 +528,7 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> TransitMark::GetSymbolNames() c
   if (m_symbolNames.empty())
     return nullptr;
   return make_unique_dp<SymbolNameZoomInfo>(m_symbolNames);
-};
+}
 
 // static
 void TransitMark::GetDefaultTransitTitle(dp::TitleDecl & titleDecl)

diff --git a/platform/qt_location_service.cpp b/platform/qt_location_service.cpp
@@ -55,7 +55,7 @@ static location::TLocationSource qStringToTLocationSource(QString const & source
 
   return location::TLocationSource::EUndefined;
 }
-};
+}
 
 
 QtLocationService::QtLocationService(location::LocationObserver & observer, std::string const & sourceName) : LocationService(observer)

diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp
@@ -19,7 +19,7 @@ template <double const & (*F)(double const &, double const &), typename WeightAn
 WeightAndETA Pick(WeightAndETA const & lhs, WeightAndETA const & rhs)
 {
   return {F(lhs.m_weight, rhs.m_weight), F(lhs.m_eta, rhs.m_eta)};
-};
+}
 
 SpeedKMpH Max(SpeedKMpH const & lhs, InOutCitySpeedKMpH const & rhs)
 {

diff --git a/transit/experimental/transit_types_experimental.cpp b/transit/experimental/transit_types_experimental.cpp
@@ -276,7 +276,7 @@ bool Gate::IsValid() const
 void Gate::SetBestPedestrianSegments(std::vector<SingleMwmSegment> const & seg)
 {
   m_bestPedestrianSegments = seg;
-};
+}
 
 FeatureId Gate::GetFeatureId() const { return m_ids.GetFeatureId(); }
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,7 +191,7 @@ void OGLContext::SetDepthTestEnabled(bool enabled) @@
     void OGLContext::SetDepthTestFunction(TestFunction depthFunction)
     {
       GLFunctions::glDepthFunc(DecodeTestFunction(depthFunction));
-    };
+    }
     void OGLContext::SetStencilTestEnabled(bool enabled)
     {
@@ Expand Down @@