diff --git a/example/example.cpp b/example/example.cpp index 345f8bd1..e6508156 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -1,11 +1,9 @@ // // Copyright(c) 2015 Gabi Melman. // Distributed under the MIT License (http://opensource.org/licenses/MIT) -// -// + + // spdlog usage example -// -// #include @@ -26,7 +24,7 @@ void clone_example(); int main(int, char *[]) { - spdlog::info("Welcome to spdlog version {}.{}.{} !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH); + spdlog::info(" Welcome to spdlog version {}.{}.{} !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH); spdlog::warn("Easy padding in numbers like {:08d}", 12); spdlog::critical("Support for int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}", 42); spdlog::info("Support for floats {:03.2f}", 1.23456); diff --git a/src/spdlog.cpp b/src/spdlog.cpp index 319956a4..d4e78ffc 100644 --- a/src/spdlog.cpp +++ b/src/spdlog.cpp @@ -8,8 +8,10 @@ #include #include -#include "spdlog/common.h" +#include "spdlog/spdlog.h" +#include "spdlog/async.h" +#include "spdlog/common.h" #include "spdlog/common-inl.h" #include "spdlog/details/null_mutex.h" @@ -56,22 +58,33 @@ template class spdlog::sinks::rotating_file_sink; #include "spdlog/details/thread_pool-inl.h" template class spdlog::details::mpmc_blocking_queue; -#ifndef _WIN32 -#include "spdlog/sinks/ansicolor_sink.h" -#include "spdlog/sinks/ansicolor_sink-inl.h" -template class spdlog::sinks::ansicolor_sink; -template class spdlog::sinks::ansicolor_sink; -template class spdlog::sinks::ansicolor_sink; -template class spdlog::sinks::ansicolor_sink; -#else +#ifdef _WIN32 #include "spdlog/sinks/wincolor_sink.h" #include "spdlog/sinks/wincolor_sink-inl.h" template class spdlog::sinks::wincolor_sink; template class spdlog::sinks::wincolor_sink; template class spdlog::sinks::wincolor_sink; template class spdlog::sinks::wincolor_sink; +#else +#include "spdlog/sinks/ansicolor_sink.h" +#include "spdlog/sinks/ansicolor_sink-inl.h" +template class spdlog::sinks::ansicolor_sink; +template class spdlog::sinks::ansicolor_sink; +template class spdlog::sinks::ansicolor_sink; +template class spdlog::sinks::ansicolor_sink; #endif +#include "spdlog/sinks/stdout_color_sinks.h" +#include "spdlog/sinks/stdout_color_sinks-inl.h" +template std::shared_ptr spdlog::stdout_color_mt(const std::string &logger_name); +template std::shared_ptr spdlog::stdout_color_st(const std::string &logger_name); +template std::shared_ptr spdlog::stderr_color_mt(const std::string &logger_name); +template std::shared_ptr spdlog::stderr_color_st(const std::string &logger_name); + +template std::shared_ptr spdlog::stdout_color_mt(const std::string &logger_name); +template std::shared_ptr spdlog::stdout_color_st(const std::string &logger_name); +template std::shared_ptr spdlog::stderr_color_mt(const std::string &logger_name); +template std::shared_ptr spdlog::stderr_color_st(const std::string &logger_name); // fmt_helper templates #include "spdlog/details/fmt_helper.h"