Commit 6080efa8 authored by captainwong's avatar captainwong

reset spdlog

parent 3d62a5fa
......@@ -15,8 +15,8 @@
// 3. will throw spdlog_ex upon log exceptions
// Upon destruction, logs all remaining messages in the queue before destructing..
#include <spdlog/common.h>
#include <spdlog/logger.h>
#include "common.h"
#include "logger.h"
#include <chrono>
#include <functional>
......@@ -79,4 +79,4 @@ private:
}
#include <spdlog/details/async_logger_impl.h>
#include "spdlog/details/async_logger_impl.h"
......@@ -18,7 +18,7 @@
#include <locale>
#endif
#include <spdlog/details/null_mutex.h>
#include "details/null_mutex.h"
//visual studio upto 2013 does not support noexcept nor constexpr
#if defined(_MSC_VER) && (_MSC_VER < 1900)
......@@ -38,7 +38,7 @@
#endif
#include <spdlog/fmt/fmt.h>
#include "fmt/fmt.h"
namespace spdlog
{
......@@ -78,7 +78,7 @@ typedef enum
static const char* level_names[] { "trace", "debug", "info", "warning", "error", "critical", "off" };
static const char* short_level_names[] { "T", "D", "I", "W", "E", "C", "O" };
static const char* short_level_names[] { "TRAC", "DBUG", "INFO", "WARN", "ERRO", "CRTC", "OFF" };
inline const char* to_str(spdlog::level::level_enum l)
{
......
......@@ -14,12 +14,12 @@
#pragma once
#include <spdlog/common.h>
#include <spdlog/sinks/sink.h>
#include <spdlog/details/mpmc_bounded_q.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/details/os.h>
#include <spdlog/formatter.h>
#include "common.h"
#include "sinks/sink.h"
#include "details/mpmc_bounded_q.h"
#include "details/log_msg.h"
#include "details/os.h"
#include "formatter.h"
#include <chrono>
#include <exception>
......
......@@ -8,8 +8,8 @@
// Async Logger implementation
// Use an async_sink (queue per logger) to perform the logging in a worker thread
#include <spdlog/details/async_log_helper.h>
#include <spdlog/async_logger.h>
#include "details/async_log_helper.h"
#include "async_logger.h"
#include <string>
#include <functional>
......
......@@ -10,8 +10,8 @@
// Can be set to auto flush on every line
// Throw spdlog_ex exception on errors
#include <spdlog/details/os.h>
#include <spdlog/details/log_msg.h>
#include "details/os.h"
#include "details/log_msg.h"
#include <chrono>
#include <cstdio>
......
......@@ -5,8 +5,8 @@
#pragma once
#include <spdlog/common.h>
#include <spdlog/details/os.h>
#include "../common.h"
#include "os.h"
#include <string>
......
......@@ -5,8 +5,8 @@
#pragma once
#include <spdlog/logger.h>
#include <spdlog/sinks/stdout_sinks.h>
#include "spdlog/logger.h"
#include "spdlog/sinks/stdout_sinks.h"
#include <memory>
#include <string>
......
......@@ -43,7 +43,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include <spdlog/common.h>
#include "spdlog/common.h"
#include <atomic>
#include <utility>
......
......@@ -4,7 +4,7 @@
//
#pragma once
#include <spdlog/common.h>
#include "spdlog/common.h"
#include <cstdio>
#include <ctime>
......
......@@ -5,10 +5,10 @@
#pragma once
#include <spdlog/formatter.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/details/os.h>
#include <spdlog/fmt/fmt.h>
#include "spdlog/formatter.h"
#include "spdlog/details/log_msg.h"
#include "spdlog/details/os.h"
#include "spdlog/fmt/fmt.h"
#include <chrono>
#include <ctime>
......
......@@ -10,10 +10,10 @@
// If user requests a non existing logger, nullptr will be returned
// This class is thread safe
#include <spdlog/details/null_mutex.h>
#include <spdlog/logger.h>
#include <spdlog/async_logger.h>
#include <spdlog/common.h>
#include "spdlog/details/null_mutex.h"
#include "spdlog/logger.h"
#include "spdlog/async_logger.h"
#include "spdlog/common.h"
#include <chrono>
#include <functional>
......
......@@ -8,23 +8,23 @@
//
// Global registry functions
//
#include <spdlog/spdlog.h>
#include <spdlog/details/registry.h>
#include <spdlog/sinks/file_sinks.h>
#include <spdlog/sinks/stdout_sinks.h>
#include "spdlog/spdlog.h"
#include "spdlog/details/registry.h"
#include "spdlog/sinks/file_sinks.h"
#include "spdlog/sinks/stdout_sinks.h"
#ifdef SPDLOG_ENABLE_SYSLOG
#include <spdlog/sinks/syslog_sink.h>
#include "spdlog/sinks/syslog_sink.h"
#endif
#ifdef _WIN32
#include <spdlog/sinks/wincolor_sink.h>
#include "spdlog/sinks/wincolor_sink.h"
#else
#include <spdlog/sinks/ansicolor_sink.h>
#include "spdlog/sinks/ansicolor_sink.h"
#endif
#ifdef __ANDROID__
#include <spdlog/sinks/android_sink.h>
#include "spdlog/sinks/android_sink.h"
#endif
#include <chrono>
......
......@@ -18,7 +18,7 @@
#ifndef FMT_USE_WINDOWS_H
#define FMT_USE_WINDOWS_H 0
#endif
#include <spdlog/fmt/bundled/format.h>
#include "spdlog/fmt/bundled/format.h"
#else //external fmtlib
......
......@@ -5,7 +5,7 @@
#pragma once
#include <spdlog/details/log_msg.h>
#include "spdlog/details/log_msg.h"
#include <vector>
#include <string>
......@@ -41,5 +41,5 @@ private:
};
}
#include <spdlog/details/pattern_formatter_impl.h>
#include "spdlog/details/pattern_formatter_impl.h"
......@@ -12,8 +12,8 @@
// 2. Format the message using the formatter function
// 3. Pass the formatted message to its sinks to performa the actual logging
#include <spdlog/sinks/base_sink.h>
#include <spdlog/common.h>
#include "sinks/base_sink.h"
#include "common.h"
#include <vector>
#include <memory>
......@@ -91,4 +91,4 @@ protected:
};
}
#include <spdlog/details/logger_impl.h>
#include "spdlog/details/logger_impl.h"
......@@ -10,10 +10,10 @@
// all locking is taken care of here so no locking needed by the implementers..
//
#include <spdlog/sinks/sink.h>
#include <spdlog/formatter.h>
#include <spdlog/common.h>
#include <spdlog/details/log_msg.h>
#include "spdlog/sinks/sink.h"
#include "spdlog/formatter.h"
#include "spdlog/common.h"
#include "spdlog/details/log_msg.h"
#include <mutex>
......
......@@ -5,10 +5,10 @@
#pragma once
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>
#include <spdlog/details/file_helper.h>
#include <spdlog/fmt/fmt.h>
#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/details/file_helper.h"
#include "spdlog/fmt/fmt.h"
#include <algorithm>
#include <chrono>
......
......@@ -7,8 +7,8 @@
#if defined(_MSC_VER)
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>
#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include <WinBase.h>
......
......@@ -6,7 +6,7 @@
#pragma once
#include <spdlog/details/log_msg.h>
#include "spdlog/details/log_msg.h"
namespace spdlog
{
......
......@@ -5,8 +5,8 @@
#pragma once
#include <spdlog/details/null_mutex.h>
#include <spdlog/sinks/base_sink.h>
#include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h"
#include <cstdio>
#include <memory>
......
......@@ -5,9 +5,9 @@
#pragma once
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>
#include <spdlog/common.h>
#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/common.h"
#include <mutex>
#include <string>
......
......@@ -9,9 +9,9 @@
#define SPDLOG_VERSION "0.13.0"
#include <spdlog/tweakme.h>
#include <spdlog/common.h>
#include <spdlog/logger.h>
#include "tweakme.h"
#include "common.h"
#include "logger.h"
#include <memory>
#include <functional>
......@@ -175,4 +175,4 @@ void drop_all();
}
#include <spdlog/details/spdlog_impl.h>
#include "spdlog/details/spdlog_impl.h"
......@@ -17,7 +17,9 @@
// This clock is less accurate - can be off by dozens of millis - depending on the kernel HZ.
// Uncomment to use it instead of the regular clock.
//
// #define SPDLOG_CLOCK_COARSE
#ifdef __GNUG__
#define SPDLOG_CLOCK_COARSE
#endif
///////////////////////////////////////////////////////////////////////////////
......@@ -52,8 +54,8 @@
///////////////////////////////////////////////////////////////////////////////
// Uncomment to enable the SPDLOG_DEBUG/SPDLOG_TRACE macros.
//
// #define SPDLOG_DEBUG_ON
// #define SPDLOG_TRACE_ON
#define SPDLOG_DEBUG_ON
#define SPDLOG_TRACE_ON
///////////////////////////////////////////////////////////////////////////////
......@@ -76,7 +78,9 @@
///////////////////////////////////////////////////////////////////////////////
// Uncomment to enable usage of wchar_t for file names on Windows.
//
// #define SPDLOG_WCHAR_FILENAMES
#ifdef WIN32
#define SPDLOG_WCHAR_FILENAMES
#endif
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment