From e53428108bfb6761b5be29cfb9aaac4ad5b512cc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 30 Apr 2016 18:19:30 +0300
Subject: Rename Logger::assert into Logger::assertLog for this issue with some
 systems.

---
 src/logger.cpp           | 2 +-
 src/logger.h             | 2 +-
 src/utils/checkutils.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/logger.cpp b/src/logger.cpp
index 395daa135..97a3d7495 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -264,7 +264,7 @@ void Logger::log(const char *const log_text, ...)
     delete [] buf;
 }
 
-void Logger::assert(const char *const log_text, ...)
+void Logger::assertLog(const char *const log_text, ...)
 {
     if (settings.disableLoggingInGame)
         return;
diff --git a/src/logger.h b/src/logger.h
index 0088facc8..76b073938 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -120,7 +120,7 @@ class Logger final
         /**
          * Enters a message in the log. The message will be timestamped.
          */
-        void assert(const char *const log_text, ...) A_NONNULL(2)
+        void assertLog(const char *const log_text, ...) A_NONNULL(2)
 #ifdef __GNUC__
 #ifdef __OpenBSD__
 
diff --git a/src/utils/checkutils.cpp b/src/utils/checkutils.cpp
index 20c22df46..4953314e1 100644
--- a/src/utils/checkutils.cpp
+++ b/src/utils/checkutils.cpp
@@ -67,7 +67,7 @@ void reportStack(const char *const file,
 
     logger->log("--- %s --------------------------------------------",
         name);
-    logger->assert("%s:%u: '%s' in function `%s'",
+    logger->assertLog("%s:%u: '%s' in function `%s'",
         file,
         line,
         text,
-- 
cgit v1.2.3-70-g09d2