From 32420b77c8a4f4c918ed8871dbe59944c566f2bf Mon Sep 17 00:00:00 2001
From: possiblyhuman <46502820+possiblyhuman@users.noreply.github.com>
Date: Wed, 9 Jan 2019 21:15:19 +0000
Subject: [PATCH] Reduced amount of macros used. Removed
 SPDLOG_SOURCE_MACROS_ON and SPDLOG_FUNCTION_SUFFIX.

---
 include/spdlog/details/pattern_formatter.h |  3 ---
 include/spdlog/spdlog.h                    | 18 ++++++------------
 include/spdlog/tweakme.h                   | 14 --------------
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/include/spdlog/details/pattern_formatter.h b/include/spdlog/details/pattern_formatter.h
index b63857a3..c0ad86e8 100644
--- a/include/spdlog/details/pattern_formatter.h
+++ b/include/spdlog/details/pattern_formatter.h
@@ -910,9 +910,6 @@ public:
         }
         scoped_pad p(msg.source.funcname, padinfo_, dest);
         fmt_helper::append_string_view(msg.source.funcname, dest);
-#ifdef SPDLOG_FUNCTION_SUFFIX
-        fmt_helper::append_string_view(SPDLOG_FUNCTION_SUFFIX, dest);
-#endif
     }
 };
 
diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h
index 8e33fef0..3f2b3774 100644
--- a/include/spdlog/spdlog.h
+++ b/include/spdlog/spdlog.h
@@ -317,16 +317,10 @@ inline void critical(const wchar_t *fmt, const Args &... args)
     #define SPDLOG_FUNCTION __FUNCTION__
 #endif
 
-#ifdef SPDLOG_SOURCE_MACROS_ON
-    #define SPDLOG_LOG_MACRO(...) log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, __VA_ARGS__)
-#else
-    #define SPDLOG_LOG_MACRO(...) log(__VA_ARGS__)
-#endif
-
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE
 #define SPDLOG_LOGGER_TRACE(logger, ...)\
     if(logger->should_log(spdlog::level::trace))\
-        logger->SPDLOG_LOG_MACRO(spdlog::level::trace, __VA_ARGS__)
+        logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, spdlog::level::trace, __VA_ARGS__)
 #define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__)
 #else
 #define SPDLOG_LOGGER_TRACE(logger, ...) (void)0
@@ -334,7 +328,7 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 #endif
 
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG
-#define SPDLOG_LOGGER_DEBUG(logger, ...) logger->SPDLOG_LOG_MACRO(spdlog::level::debug, __VA_ARGS__)
+#define SPDLOG_LOGGER_DEBUG(logger, ...) logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, spdlog::level::debug, __VA_ARGS__)
 #define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__)
 #else
 #define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0
@@ -342,7 +336,7 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 #endif
 
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO
-#define SPDLOG_LOGGER_INFO(logger, ...) logger->SPDLOG_LOG_MACRO(spdlog::level::info, __VA_ARGS__)
+#define SPDLOG_LOGGER_INFO(logger, ...) logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, spdlog::level::info, __VA_ARGS__)
 #define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__)
 #else
 #define SPDLOG_LOGGER_INFO(logger, ...) (void)0
@@ -350,7 +344,7 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 #endif
 
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN
-#define SPDLOG_LOGGER_WARN(logger, ...) logger->SPDLOG_LOG_MACRO(spdlog::level::warn, __VA_ARGS__)
+#define SPDLOG_LOGGER_WARN(logger, ...) logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, spdlog::level::warn, __VA_ARGS__)
 #define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__)
 #else
 #define SPDLOG_LOGGER_WARN(logger, ...) (void)0
@@ -358,7 +352,7 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 #endif
 
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR
-#define SPDLOG_LOGGER_ERROR(logger, ...) logger->SPDLOG_LOG_MACRO(spdlog::level::err, __VA_ARGS__)
+#define SPDLOG_LOGGER_ERROR(logger, ...) logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, spdlog::level::err, __VA_ARGS__)
 #define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__)
 #else
 #define SPDLOG_LOGGER_ERROR(logger, ...) (void)0
@@ -366,7 +360,7 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 #endif
 
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL
-#define SPDLOG_LOGGER_CRITICAL(logger, ...) logger->SPDLOG_LOG_MACRO(spdlog::level::critical, __VA_ARGS__)
+#define SPDLOG_LOGGER_CRITICAL(logger, ...) logger->log(spdlog::source_loc{SPDLOG_FILE_BASENAME(__FILE__), __LINE__, SPDLOG_FUNCTION}, spdlog::level::critical, __VA_ARGS__)
 #define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__)
 #else
 #define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0
diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
index 82ee90ef..b3b71e4f 100644
--- a/include/spdlog/tweakme.h
+++ b/include/spdlog/tweakme.h
@@ -135,13 +135,6 @@
 // #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
 ///////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////////
-// Uncomment to enable file name, file number and function name macros.
-// Used in macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) etc
-//
-// #define SPDLOG_SOURCE_MACROS_ON
-///////////////////////////////////////////////////////////////////////////////
-
 ///////////////////////////////////////////////////////////////////////////////
 // Uncomment (and change if desired) macro to use for function names.
 // This is compiler dependent.
@@ -149,11 +142,4 @@
 // Defaults to __FUNCTION__ (should work on all compilers) if not defined.
 //
 // #define SPDLOG_FUNCTION __PRETTY_FUNCTION__
-///////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// Uncomment (and change if desired) string to add to the end of functions names.
-// Used in macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) etc
-//
-// #define SPDLOG_FUNCTION_SUFFIX "()"
 ///////////////////////////////////////////////////////////////////////////////
\ No newline at end of file