From cd376a5c4328323cb9e0fb57bb209bf2fe979175 Mon Sep 17 00:00:00 2001 From: Mikael Lund Date: Sun, 30 May 2021 13:02:56 +0100 Subject: [PATCH 1/2] Allow compilation with nvc++ --- include/spdlog/common.h | 1 + include/spdlog/sinks/stdout_color_sinks-inl.h | 3 ++- src/async.cpp | 3 ++- src/cfg.cpp | 3 ++- src/file_sinks.cpp | 3 ++- src/spdlog.cpp | 3 ++- src/stdout_sinks.cpp | 3 ++- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/include/spdlog/common.h b/include/spdlog/common.h index dee5baca..af405095 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -275,3 +275,4 @@ std::unique_ptr make_unique(Args &&...args) #ifdef SPDLOG_HEADER_ONLY #include "common-inl.h" #endif + diff --git a/include/spdlog/sinks/stdout_color_sinks-inl.h b/include/spdlog/sinks/stdout_color_sinks-inl.h index 653aca80..4e2a649a 100644 --- a/include/spdlog/sinks/stdout_color_sinks-inl.h +++ b/include/spdlog/sinks/stdout_color_sinks-inl.h @@ -35,4 +35,5 @@ SPDLOG_INLINE std::shared_ptr stderr_color_st(const std::string &logger_ { return Factory::template create(logger_name, mode); } -} // namespace spdlog \ No newline at end of file +} // namespace spdlog + diff --git a/src/async.cpp b/src/async.cpp index d7ee8274..f739aa5d 100644 --- a/src/async.cpp +++ b/src/async.cpp @@ -10,4 +10,5 @@ #include #include -template class SPDLOG_API spdlog::details::mpmc_blocking_queue; \ No newline at end of file +template class SPDLOG_API spdlog::details::mpmc_blocking_queue; + diff --git a/src/cfg.cpp b/src/cfg.cpp index d3fe47f3..afef8ac4 100644 --- a/src/cfg.cpp +++ b/src/cfg.cpp @@ -5,4 +5,5 @@ #error Please define SPDLOG_COMPILED_LIB to compile this file. #endif -#include \ No newline at end of file +#include + diff --git a/src/file_sinks.cpp b/src/file_sinks.cpp index 5fd7e98a..7c92d300 100644 --- a/src/file_sinks.cpp +++ b/src/file_sinks.cpp @@ -17,4 +17,5 @@ template class SPDLOG_API spdlog::sinks::basic_file_sink template class SPDLOG_API spdlog::sinks::rotating_file_sink; -template class SPDLOG_API spdlog::sinks::rotating_file_sink; \ No newline at end of file +template class SPDLOG_API spdlog::sinks::rotating_file_sink; + diff --git a/src/spdlog.cpp b/src/spdlog.cpp index c0904e6c..87e26320 100644 --- a/src/spdlog.cpp +++ b/src/spdlog.cpp @@ -23,4 +23,5 @@ // template instantiate logger constructor with sinks init list template SPDLOG_API spdlog::logger::logger(std::string name, sinks_init_list::iterator begin, sinks_init_list::iterator end); template class SPDLOG_API spdlog::sinks::base_sink; -template class SPDLOG_API spdlog::sinks::base_sink; \ No newline at end of file +template class SPDLOG_API spdlog::sinks::base_sink; + diff --git a/src/stdout_sinks.cpp b/src/stdout_sinks.cpp index 9e86e061..b790df05 100644 --- a/src/stdout_sinks.cpp +++ b/src/stdout_sinks.cpp @@ -26,4 +26,5 @@ template SPDLOG_API std::shared_ptr spdlog::stderr_logger_st spdlog::stdout_logger_mt(const std::string &logger_name); template SPDLOG_API std::shared_ptr spdlog::stdout_logger_st(const std::string &logger_name); template SPDLOG_API std::shared_ptr spdlog::stderr_logger_mt(const std::string &logger_name); -template SPDLOG_API std::shared_ptr spdlog::stderr_logger_st(const std::string &logger_name); \ No newline at end of file +template SPDLOG_API std::shared_ptr spdlog::stderr_logger_st(const std::string &logger_name); + From faf06bcfe59d34e43b892206ac21fdf3f654377a Mon Sep 17 00:00:00 2001 From: Mikael Lund Date: Sun, 30 May 2021 13:07:16 +0100 Subject: [PATCH 2/2] Add newlin to color_sinks.cpp --- src/color_sinks.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/color_sinks.cpp b/src/color_sinks.cpp index cff6148b..93eea6f5 100644 --- a/src/color_sinks.cpp +++ b/src/color_sinks.cpp @@ -49,3 +49,4 @@ template SPDLOG_API std::shared_ptr spdlog::stderr_color_mt spdlog::stderr_color_st( const std::string &logger_name, color_mode mode); +