Merge cda69b4dd6 into 9e6d81de08

README.md

@@ -149,13 +149,13 @@ int main(int, char*[])
         err_handler_example();
 
         // Apply a function on all registered loggers
-        spd::apply_all([&](std::shared_ptr<spd::logger> l)
+        spd::apply_all([&](std::shared_ptr<spdlog::logger> l)
         {
             l->info("End of example.");
         });
 
         // Release and close all loggers
-        spd::drop_all();
+        spdlog::drop_all();
     }
     // Exceptions will only be thrown upon failed logger or sink construction (not during logging)
     catch (const spd::spdlog_ex& ex)
@@ -168,7 +168,7 @@ int main(int, char*[])
 void async_example()
 {
     size_t q_size = 4096; //queue size must be power of 2
-    spd::set_async_mode(q_size);
+    spdlog::set_async_mode(q_size);
     auto async_file = spd::daily_logger_st("async_file_logger", "logs/async_log.txt");
     for (int i = 0; i < 100; ++i)
         async_file->info("Async message #{}", i);
@@ -206,7 +206,7 @@ void user_defined_example()
 //
 void err_handler_example()
 {	
-	spd::set_error_handler([](const std::string& msg) {
+	spdlog::set_error_handler([](const std::string& msg) {
 		std::cerr << "my err handler: " << msg << std::endl;
 	}); 
 	// (or logger->set_error_handler(..) to set for specific logger)

include/spdlog/details/logger_impl.h

@@ -18,11 +18,11 @@ template<class It>
 inline spdlog::logger::logger(const std::string& logger_name, const It& begin, const It& end):
     _name(logger_name),
     _sinks(begin, end),
-    _formatter(std::make_shared<pattern_formatter>("%+")),
-	_level(level::info),
-	_flush_level(level::off),
-	_last_err_time(0)
+    _formatter(std::make_shared<pattern_formatter>("%+"))
 {
+    _level = level::info;
+    _flush_level = level::off;
+    _last_err_time = 0;
     _err_handler = [this](const std::string &msg)
     {
         this->_default_err_handler(msg);
@@ -294,3 +294,61 @@ inline const std::vector<spdlog::sink_ptr>& spdlog::logger::sinks() const
 {
     return _sinks;
 }
+
+#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
+#include <codecvt>
+
+template <typename... Args>
+inline void spdlog::logger::log(level::level_enum lvl, const wchar_t* msg)
+{
+	std::wstring_convert<std::codecvt_utf8<wchar_t> > conv;
+
+	log(lvl, conv.to_bytes(msg));
+}
+
+template <typename... Args>
+inline void spdlog::logger::log(level::level_enum lvl, const wchar_t* fmt, const Args&... args)
+{
+	fmt::WMemoryWriter wWriter;
+
+	wWriter.write(fmt, args...);
+	log(lvl, wWriter.c_str());
+}
+
+template <typename... Args>
+inline void spdlog::logger::trace(const wchar_t* fmt, const Args&... args)
+{
+	log(level::trace, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::debug(const wchar_t* fmt, const Args&... args)
+{
+	log(level::debug, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::info(const wchar_t* fmt, const Args&... args)
+{
+	log(level::info, fmt, args...);
+}
+
+
+template <typename... Args>
+inline void spdlog::logger::warn(const wchar_t* fmt, const Args&... args)
+{
+	log(level::warn, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::error(const wchar_t* fmt, const Args&... args)
+{
+	log(level::err, fmt, args...);
+}
+
+template <typename... Args>
+inline void spdlog::logger::critical(const wchar_t* fmt, const Args&... args)
+{
+	log(level::critical, fmt, args...);
+}
+#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT

include/spdlog/details/os.h

@@ -375,7 +375,7 @@ inline std::string errno_str(int err_num)
     if(strerror_s(buf, buf_size, err_num) == 0)
         return std::string(buf);
     else
-        return "Unknown error";
+        return "Unkown error";
 
 #elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) || \
       ((_POSIX_C_SOURCE >= 200112L) && ! defined(_GNU_SOURCE)) // posix version
@@ -383,7 +383,7 @@ inline std::string errno_str(int err_num)
     if (strerror_r(err_num, buf, buf_size) == 0)
         return std::string(buf);
     else
-        return "Unknown error";
+        return "Unkown error";
 
 #else  // gnu version (might not use the given buf, so its retval pointer must be used)
     return std::string(strerror_r(err_num, buf, buf_size));

include/spdlog/logger.h

@@ -51,6 +51,17 @@ public:
     template <typename T> void warn(const T&);
     template <typename T> void error(const T&);
     template <typename T> void critical(const T&);
+  
+#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
+	template <typename... Args> void log(level::level_enum lvl, const wchar_t* msg);
+	template <typename... Args> void log(level::level_enum lvl, const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void trace(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void debug(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void info(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void warn(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void error(const wchar_t* fmt, const Args&... args);
+	template <typename... Args> void critical(const wchar_t* fmt, const Args&... args);
+#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
 
     bool should_log(level::level_enum) const;
     void set_level(level::level_enum);

include/spdlog/tweakme.h

@@ -106,3 +106,10 @@
 //
 // #define SPDLOG_PREVENT_CHILD_FD
 ///////////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Uncomment to enable wchar_t support (convert to utf8)
+//
+// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT
+///////////////////////////////////////////////////////////////////////////////