[routing] Pull request #6720 review fixesbeta-939beta-935

7 files changed, 39 insertions, 48 deletions

diff --git a/android/UnitTests/jni/mock.cpp b/android/UnitTests/jni/mock.cpp
index 7f203bcdb1..a9b61ad8db 100644
--- a/android/UnitTests/jni/mock.cpp
+++ b/android/UnitTests/jni/mock.cpp
@@ -34,7 +34,7 @@ static void AndroidLogMessage(LogLevel l, SrcPoint const & src, std::string cons
   __android_log_write(pr, " MapsMeTests ", out.c_str());
 }
 
-static void AndroidAssertMessage(SrcPoint const & src, std::string const & s)
+static bool AndroidAssertMessage(SrcPoint const & src, std::string const & s)
 {
 #if defined(MWM_LOG_TO_FILE)
   AndroidLogToFile(LERROR, src, s);
@@ -47,6 +47,7 @@ static void AndroidAssertMessage(SrcPoint const & src, std::string const & s)
 #else
     MYTHROW(RootException, (s));
 #endif
+  return true;
 }
 
 static void InitSystemLog()
diff --git a/android/jni/com/mapswithme/core/logging.cpp b/android/jni/com/mapswithme/core/logging.cpp
index 03c8e35049..32ec3a5aba 100644
--- a/android/jni/com/mapswithme/core/logging.cpp
+++ b/android/jni/com/mapswithme/core/logging.cpp
@@ -50,9 +50,10 @@ void AndroidLogMessage(LogLevel level, SrcPoint const & src, std::string const &
   CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
 }
 
-void AndroidAssertMessage(SrcPoint const & src, std::string const & s)
+bool AndroidAssertMessage(SrcPoint const & src, std::string const & s)
 {
   AndroidMessage(LCRITICAL, src, s);
+  return true;
 }
 
 void InitSystemLog()
diff --git a/base/assert.hpp b/base/assert.hpp
index 35137b8c27..16c78dc89e 100644
--- a/base/assert.hpp
+++ b/base/assert.hpp
@@ -11,58 +11,55 @@
 namespace my
 {
   // Called when ASSERT, CHECK or VERIFY failed.
-  typedef void (*AssertFailedFn)(SrcPoint const &, std::string const &);
+  // If returns true then crash application.
+  typedef bool (*AssertFailedFn)(SrcPoint const &, std::string const &);
   extern AssertFailedFn OnAssertFailed;
 
   /// @return Pointer to previous message function.
   AssertFailedFn SetAssertFunction(AssertFailedFn fn);
-
-  bool AssertAbortIsEnabled();
-  void SwitchAssertAbort(bool enable);
 }
 
 #ifdef DEBUG
-#define ABORT_ON_ASSERT() assert(false)
+#define ASSERT_CRASH() assert(false)
 #else
-#define ABORT_ON_ASSERT() std::abort()
+#define ASSERT_CRASH() std::abort()
 #endif
 
-#define ON_ASSERT_FAILED(msg)       \
-  ::my::OnAssertFailed(SRC(), msg); \
-  if (::my::AssertAbortIsEnabled()) \
-    ABORT_ON_ASSERT();
+#define ASSERT_FAIL(msg)                \
+  if (::my::OnAssertFailed(SRC(), msg)) \
+    ASSERT_CRASH();
 
 // TODO: Evaluate X only once in CHECK().
 #define CHECK(X, msg) do { if (X) {} else { \
-  ON_ASSERT_FAILED(::my::impl::Message("CHECK("#X")", ::my::impl::Message msg));} } while(false)
+  ASSERT_FAIL(::my::impl::Message("CHECK("#X")", ::my::impl::Message msg));} } while(false)
 #define CHECK_EQUAL(X, Y, msg) do { if ((X) == (Y)) {} else { \
-  ON_ASSERT_FAILED(::my::impl::Message("CHECK("#X" == "#Y")", \
-                                        ::my::impl::Message(X, Y), \
-                                        ::my::impl::Message msg));} } while (false)
+  ASSERT_FAIL(::my::impl::Message("CHECK("#X" == "#Y")", \
+                                   ::my::impl::Message(X, Y), \
+                                   ::my::impl::Message msg));} } while (false)
 #define CHECK_NOT_EQUAL(X, Y, msg) do { if ((X) != (Y)) {} else { \
-  ON_ASSERT_FAILED(::my::impl::Message("CHECK("#X" != "#Y")", \
-                                        ::my::impl::Message(X, Y), \
-                                        ::my::impl::Message msg));} } while (false)
+  ASSERT_FAIL(::my::impl::Message("CHECK("#X" != "#Y")", \
+                                   ::my::impl::Message(X, Y), \
+                                   ::my::impl::Message msg));} } while (false)
 #define CHECK_LESS(X, Y, msg) do { if ((X) < (Y)) {} else { \
-  ON_ASSERT_FAILED(::my::impl::Message("CHECK("#X" < "#Y")", \
-                                        ::my::impl::Message(X, Y), \
-                                        ::my::impl::Message msg));} } while (false)
+  ASSERT_FAIL(::my::impl::Message("CHECK("#X" < "#Y")", \
+                                   ::my::impl::Message(X, Y), \
+                                   ::my::impl::Message msg));} } while (false)
 #define CHECK_LESS_OR_EQUAL(X, Y, msg) do { if ((X) <= (Y)) {} else { \
-  ON_ASSERT_FAILED(::my::impl::Message("CHECK("#X" <= "#Y")", \
-                                        ::my::impl::Message(X, Y), \
-                                        ::my::impl::Message msg));} } while (false)
+  ASSERT_FAIL(::my::impl::Message("CHECK("#X" <= "#Y")", \
+                                   ::my::impl::Message(X, Y), \
+                                   ::my::impl::Message msg));} } while (false)
 #define CHECK_GREATER(X, Y, msg) do { if ((X) > (Y)) {} else { \
-  ON_ASSERT_FAILED(::my::impl::Message("CHECK("#X" > "#Y")", \
-                                        ::my::impl::Message(X, Y), \
-                                        ::my::impl::Message msg));} } while (false)
+  ASSERT_FAIL(::my::impl::Message("CHECK("#X" > "#Y")", \
+                                   ::my::impl::Message(X, Y), \
+                                   ::my::impl::Message msg));} } while (false)
 #define CHECK_GREATER_OR_EQUAL(X, Y, msg) do { if ((X) >= (Y)) {} else { \
-  ON_ASSERT_FAILED(::my::impl::Message("CHECK("#X" >= "#Y")", \
-                                        ::my::impl::Message(X, Y), \
-                                        ::my::impl::Message msg));} } while (false)
+  ASSERT_FAIL(::my::impl::Message("CHECK("#X" >= "#Y")", \
+                                   ::my::impl::Message(X, Y), \
+                                   ::my::impl::Message msg));} } while (false)
 #define CHECK_OR_CALL(fail, call, X, msg) do { if (X) {} else { \
   if (fail) {\
-    ON_ASSERT_FAILED(::my::impl::Message(::my::impl::Message("CHECK("#X")"), \
-                                         ::my::impl::Message msg)); \
+    ASSERT_FAIL(::my::impl::Message(::my::impl::Message("CHECK("#X")"), \
+                                    ::my::impl::Message msg)); \
   } else { \
     call(); \
   } } } while (false)
diff --git a/base/base.cpp b/base/base.cpp
index df42da78b9..82a9b016b1 100644
--- a/base/base.cpp
+++ b/base/base.cpp
@@ -6,18 +6,14 @@
 
 #include <iostream>
 
-namespace
-{
-bool g_assertAbortIsEnabled = true;
-}
-
 namespace my
 {
-  void OnAssertFailedDefault(SrcPoint const & srcPoint, std::string const & msg)
+  bool OnAssertFailedDefault(SrcPoint const & srcPoint, std::string const & msg)
   {
     std::cerr << "ASSERT FAILED" << std::endl
               << srcPoint.FileName() << ":" << srcPoint.Line() << std::endl
               << msg << std::endl;
+    return true;
   }
 
   AssertFailedFn OnAssertFailed = &OnAssertFailedDefault;
@@ -27,7 +23,4 @@ namespace my
     std::swap(OnAssertFailed, fn);
     return fn;
   }
-
-  bool AssertAbortIsEnabled() { return g_assertAbortIsEnabled; }
-  void SwitchAssertAbort(bool enable) { g_assertAbortIsEnabled = enable; }
 }
diff --git a/drape/drape_tests/pointers_tests.cpp b/drape/drape_tests/pointers_tests.cpp
index 488889a2f8..365e379a48 100644
--- a/drape/drape_tests/pointers_tests.cpp
+++ b/drape/drape_tests/pointers_tests.cpp
@@ -16,9 +16,10 @@ namespace
 
 #if defined(TRACK_POINTERS)
   bool g_assertRaised = false;
-  void OnAssertRaised(my::SrcPoint const & /*srcPoint*/, string const & /*msg*/)
+  bool OnAssertRaised(my::SrcPoint const & /*srcPoint*/, string const & /*msg*/)
   {
     g_assertRaised = true;
+    return false;
   }
 #endif
 }
@@ -82,9 +83,7 @@ UNIT_TEST(RefPointerExpiringTest)
 #if defined(TRACK_POINTERS)
 
   g_assertRaised = false;
-  bool const assertAbortWasEnabled = my::AssertAbortIsEnabled();
   my::AssertFailedFn prevFn = my::SetAssertFunction(OnAssertRaised);
-  my::SwitchAssertAbort(false);
 
   drape_ptr<Tester> ptr = make_unique_dp<Tester>();
   ref_ptr<Tester> refPtr1 = make_ref(ptr);
@@ -92,7 +91,6 @@ UNIT_TEST(RefPointerExpiringTest)
   ptr.reset();
 
   my::SetAssertFunction(prevFn);
-  my::SwitchAssertAbort(assertAbortWasEnabled);
 
   TEST(g_assertRaised, ());
 
diff --git a/iphone/Maps/Common/Statistics/fabric_logging.hpp b/iphone/Maps/Common/Statistics/fabric_logging.hpp
index 0067d7d863..603c436bde 100644
--- a/iphone/Maps/Common/Statistics/fabric_logging.hpp
+++ b/iphone/Maps/Common/Statistics/fabric_logging.hpp
@@ -7,5 +7,5 @@
 namespace platform
 {
   void IosLogMessage(my::LogLevel level, my::SrcPoint const & srcPoint, std::string const & msg);
-  void IosAssertMessage(my::SrcPoint const & srcPoint, std::string const & msg);
+  bool IosAssertMessage(my::SrcPoint const & srcPoint, std::string const & msg);
 }
diff --git a/iphone/Maps/Common/Statistics/fabric_logging_ios.mm b/iphone/Maps/Common/Statistics/fabric_logging_ios.mm
index a7aa08df75..27510f2f39 100644
--- a/iphone/Maps/Common/Statistics/fabric_logging_ios.mm
+++ b/iphone/Maps/Common/Statistics/fabric_logging_ios.mm
@@ -32,11 +32,12 @@ void IosLogMessage(my::LogLevel level, my::SrcPoint const & srcPoint, std::strin
   my::LogMessageDefault(level, srcPoint, msg);
 }
 
-void IosAssertMessage(my::SrcPoint const & srcPoint, std::string const & msg)
+bool IosAssertMessage(my::SrcPoint const & srcPoint, std::string const & msg)
 {
   LogMessageFabric(my::LCRITICAL, srcPoint, msg);
   std::cerr << "ASSERT FAILED" << std::endl
             << srcPoint.FileName() << ":" << srcPoint.Line() << std::endl
             << msg << std::endl;
+  return true;
 }
 }  //  namespace platform