From d730ce9466a6eef3a64c2688ce023550181d171b Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sun, 10 Nov 2024 16:28:45 +0100
Subject: [PATCH] Minor warning fixes

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 drape_frontend/read_manager.cpp                |  2 +-
 editor/editor_tests/osm_editor_test.cpp        |  2 +-
 geometry/geometry_tests/bounding_box_tests.cpp | 11 ++++-------
 geometry/geometry_tests/diamond_box_tests.cpp  | 13 +++++--------
 geometry/geometry_tests/robust_test.cpp        |  7 +++----
 search/ranking_utils.hpp                       |  2 +-
 6 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/drape_frontend/read_manager.cpp b/drape_frontend/read_manager.cpp
index 49e1d255aa..44b6fac7ad 100755
--- a/drape_frontend/read_manager.cpp
+++ b/drape_frontend/read_manager.cpp
@@ -49,11 +49,11 @@ ReadManager::ReadManager(ref_ptr<ThreadsCommutator> commutator, MapDataProvider
   , m_trafficEnabled(trafficEnabled)
   , m_isolinesEnabled(isolinesEnabled)
   , m_modeChanged(false)
+  , m_mapLangIndex(StringUtf8Multilang::kDefaultCode)
   , m_tasksPool(64, ReadMWMTaskFactory(m_model))
   , m_counter(0)
   , m_generationCounter(0)
   , m_userMarksGenerationCounter(0)
-  , m_mapLangIndex(StringUtf8Multilang::kDefaultCode)
 {
   Start();
 }
diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp
index 3a22748220..fb82cc84de 100644
--- a/editor/editor_tests/osm_editor_test.cpp
+++ b/editor/editor_tests/osm_editor_test.cpp
@@ -246,7 +246,7 @@ void EditorTest::GetFeatureTypeInfoTest()
 
     auto const featuresAfter = editor.m_features.Get();
     auto const fti = editor.GetFeatureTypeInfo(*featuresAfter, ft.GetID().m_mwmId, ft.GetID().m_index);
-    TEST_NOT_EQUAL(fti, 0, ());
+    TEST_NOT_EQUAL(fti, nullptr, ());
     TEST_EQUAL(fti->m_object.GetID(), ft.GetID(), ());
   });
 }
diff --git a/geometry/geometry_tests/bounding_box_tests.cpp b/geometry/geometry_tests/bounding_box_tests.cpp
index feb18f001c..994068fef8 100644
--- a/geometry/geometry_tests/bounding_box_tests.cpp
+++ b/geometry/geometry_tests/bounding_box_tests.cpp
@@ -1,23 +1,20 @@
 #include "testing/testing.hpp"
 
 #include "geometry/bounding_box.hpp"
-#include "geometry/point2d.hpp"
 
-using namespace m2;
-
-namespace
+namespace bounding_box_tests
 {
 UNIT_TEST(BoundingBox_Smoke)
 {
   {
-    BoundingBox bbox;
+    m2::BoundingBox bbox;
 
     TEST(!bbox.HasPoint(0, 0), ());
     TEST(!bbox.HasPoint(-1, 1), ());
   }
 
   {
-    BoundingBox bbox;
+    m2::BoundingBox bbox;
 
     bbox.Add(0, 0);
     TEST(bbox.HasPoint(0, 0), ());
@@ -33,4 +30,4 @@ UNIT_TEST(BoundingBox_Smoke)
     TEST(bbox.HasPoint(0.5, 0.5), ());
   }
 }
-}  // namespace
+}  // namespace bounding_box_tests
\ No newline at end of file
diff --git a/geometry/geometry_tests/diamond_box_tests.cpp b/geometry/geometry_tests/diamond_box_tests.cpp
index a3ed68f0e4..4c0b16aa3e 100644
--- a/geometry/geometry_tests/diamond_box_tests.cpp
+++ b/geometry/geometry_tests/diamond_box_tests.cpp
@@ -1,21 +1,18 @@
 #include "testing/testing.hpp"
 
 #include "geometry/diamond_box.hpp"
-#include "geometry/point2d.hpp"
 
-using namespace m2;
-
-namespace
+namespace diamond_box_tests
 {
 UNIT_TEST(DiamondBox_Smoke)
 {
   {
-    DiamondBox dbox;
+    m2::DiamondBox dbox;
     TEST(!dbox.HasPoint(0, 0), ());
   }
 
   {
-    DiamondBox dbox;
+    m2::DiamondBox dbox;
     dbox.Add(0, 0);
     TEST(dbox.HasPoint(0, 0), ());
     TEST(!dbox.HasPoint(0, 1), ());
@@ -32,7 +29,7 @@ UNIT_TEST(DiamondBox_Smoke)
   }
 
   {
-    DiamondBox dbox;
+    m2::DiamondBox dbox;
 
     dbox.Add(0, 1);
     dbox.Add(0, -1);
@@ -50,4 +47,4 @@ UNIT_TEST(DiamondBox_Smoke)
     TEST(!dbox.HasPoint(-0.51, -0.51), ());
   }
 }
-}  // namespace
+}  // namespace diamond_box_tests
diff --git a/geometry/geometry_tests/robust_test.cpp b/geometry/geometry_tests/robust_test.cpp
index c04be35f79..aaf1db368e 100644
--- a/geometry/geometry_tests/robust_test.cpp
+++ b/geometry/geometry_tests/robust_test.cpp
@@ -6,10 +6,9 @@
 
 #include <iterator>
 
-using namespace m2::robust;
-
-namespace
+namespace robust_test
 {
+using namespace m2::robust;
 using P = m2::PointD;
 
 template <typename TIt>
@@ -29,7 +28,6 @@ bool InsideTriangle(P const & p, P const ps[])
 {
   return IsPointInsideTriangle(p, ps[0], ps[1], ps[2]);
 }
-}  // namespace
 
 UNIT_TEST(OrientedS_Smoke)
 {
@@ -170,3 +168,4 @@ UNIT_TEST(PolygonSelfIntersections_TangentSmoke)
     CheckSelfIntersections(&arr[0], arr + ARRAY_SIZE(arr), false);
   }
 }
+}  // namespace robust_test
\ No newline at end of file
diff --git a/search/ranking_utils.hpp b/search/ranking_utils.hpp
index 81adbf0952..069d3f3c4e 100644
--- a/search/ranking_utils.hpp
+++ b/search/ranking_utils.hpp
@@ -165,7 +165,7 @@ struct NameScores
       m_errorsMade = ErrorsMade::Min(m_errorsMade, rhs.m_errorsMade);
   }
 
-  bool operator==(NameScores const & rhs)
+  bool operator==(NameScores const & rhs) const
   {
     return m_nameScore == rhs.m_nameScore && m_errorsMade == rhs.m_errorsMade &&
            m_isAltOrOldName == rhs.m_isAltOrOldName && m_matchedLength == rhs.m_matchedLength;