Merge pull request #1958 from mlund/v1.x

Allow compilation with nvc++ (and possibly PGI)

include/spdlog/common.h

@@ -275,3 +275,4 @@ std::unique_ptr<T> make_unique(Args &&...args)
 #ifdef SPDLOG_HEADER_ONLY
 #include "common-inl.h"
 #endif
+

include/spdlog/sinks/stdout_color_sinks-inl.h

@@ -35,4 +35,5 @@ SPDLOG_INLINE std::shared_ptr<logger> stderr_color_st(const std::string &logger_
 {
     return Factory::template create<sinks::stderr_color_sink_st>(logger_name, mode);
 }
-} // namespace spdlog
+} // namespace spdlog
+

src/async.cpp

@@ -10,4 +10,5 @@
 #include <spdlog/details/periodic_worker-inl.h>
 #include <spdlog/details/thread_pool-inl.h>
 
-template class SPDLOG_API spdlog::details::mpmc_blocking_queue<spdlog::details::async_msg>;
+template class SPDLOG_API spdlog::details::mpmc_blocking_queue<spdlog::details::async_msg>;
+

src/cfg.cpp

@@ -5,4 +5,5 @@
 #error Please define SPDLOG_COMPILED_LIB to compile this file.
 #endif
 
-#include <spdlog/cfg/helpers-inl.h>
+#include <spdlog/cfg/helpers-inl.h>
+

src/color_sinks.cpp

@@ -49,3 +49,4 @@ template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_color_mt<spdl
     const std::string &logger_name, color_mode mode);
 template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_color_st<spdlog::async_factory>(
     const std::string &logger_name, color_mode mode);
+

src/file_sinks.cpp

@@ -17,4 +17,5 @@ template class SPDLOG_API spdlog::sinks::basic_file_sink<spdlog::details::null_m
 
 #include <spdlog/sinks/rotating_file_sink-inl.h>
 template class SPDLOG_API spdlog::sinks::rotating_file_sink<std::mutex>;
-template class SPDLOG_API spdlog::sinks::rotating_file_sink<spdlog::details::null_mutex>;
+template class SPDLOG_API spdlog::sinks::rotating_file_sink<spdlog::details::null_mutex>;
+

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<std::mutex>;
-template class SPDLOG_API spdlog::sinks::base_sink<spdlog::details::null_mutex>;
+template class SPDLOG_API spdlog::sinks::base_sink<spdlog::details::null_mutex>;
+

src/stdout_sinks.cpp

@@ -26,4 +26,5 @@ template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spd
 template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stdout_logger_mt<spdlog::async_factory>(const std::string &logger_name);
 template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stdout_logger_st<spdlog::async_factory>(const std::string &logger_name);
 template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_logger_mt<spdlog::async_factory>(const std::string &logger_name);
-template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_factory>(const std::string &logger_name);
+template SPDLOG_API std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_factory>(const std::string &logger_name);
+