Merge branch 'master' into typedef

CMakeLists.txt

@@ -17,6 +17,7 @@ endif()
 add_library(spdlog INTERFACE)
 
 option(SPDLOG_BUILD_EXAMPLES "Build examples" OFF)
+option(SPDLOG_BUILD_TESTING "Build spdlog tests" ON)
 
 target_include_directories(
     spdlog
@@ -27,12 +28,11 @@ target_include_directories(
 
 set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
-include(CTest)
 if(SPDLOG_BUILD_EXAMPLES)
     add_subdirectory(example)
 endif()
 
-if(BUILD_TESTING)
+if(SPDLOG_BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 

README.md

@@ -7,10 +7,9 @@ Very fast, header only, C++ logging library. [![Build Status](https://travis-ci.
 Just copy the source [folder](https://github.com/gabime/spdlog/tree/master/include/spdlog) to your build tree and use a C++11 compiler
 
 ## Platforms
- * Linux (gcc 4.8.1+, clang 3.5+)
+ * Linux, FreeBSD, Solaris
- * Windows (visual studio 2013+, cygwin/mingw with g++ 4.9.1+)
+ * Windows (vc 2013+, cygwin/mingw)
  * Mac OSX (clang 3.5+)
- * Solaris (gcc 5.2.0+)
  * Android
 
 ##Features
@@ -25,6 +24,7 @@ Just copy the source [folder](https://github.com/gabime/spdlog/tree/master/inclu
     * Daily log files.
     * Console logging (colors supported).
     * syslog.
+    * Windows debugger (```OutputDebugString(..)```)
     * Easily extendable with custom log targets  (just implement a single function in the [sink](include/spdlog/sinks/sink.h) interface).
 * Severity based filtering - threshold levels can be modified in runtime as well as in compile time.
 

include/spdlog/details/async_log_helper.h

@@ -229,8 +229,6 @@ inline spdlog::details::async_log_helper::~async_log_helper()
 inline void spdlog::details::async_log_helper::log(const details::log_msg& msg)
 {
     push_msg(async_msg(msg));
-
-
 }
 
 inline void spdlog::details::async_log_helper::push_msg(details::async_log_helper::async_msg&& new_msg)
@@ -246,7 +244,6 @@ inline void spdlog::details::async_log_helper::push_msg(details::async_log_helpe
         }
         while (!_q.enqueue(std::move(new_msg)));
     }
-
 }
 
 // optionally wait for the queue be empty and request flush from the sinks
@@ -281,10 +278,8 @@ inline void spdlog::details::async_log_helper::worker_loop()
 // return true if this thread should still be active (while no terminate msg was received)
 inline bool spdlog::details::async_log_helper::process_next_msg(log_clock::time_point& last_pop, log_clock::time_point& last_flush)
 {
-
     async_msg incoming_async_msg;
 
-
     if (_q.dequeue(incoming_async_msg))
     {
         last_pop = details::os::now();
@@ -361,7 +356,6 @@ inline void spdlog::details::async_log_helper::sleep_or_yield(const spdlog::log_
     if (time_since_op <= microseconds(100))
         return std::this_thread::yield();
 
-
     // sleep for 20 ms upto 200 ms
     if (time_since_op <= milliseconds(200))
         return sleep_for(milliseconds(20));
@@ -378,13 +372,7 @@ inline void spdlog::details::async_log_helper::wait_empty_q()
     {
         sleep_or_yield(details::os::now(), last_op);
     }
-
 }
 
 
 
-
-
-
-
-

include/spdlog/logger.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-// Thread safe logger
+// Thread safe logger (except for set_pattern(..), set_formatter(..) and set_error_handler())
 // Has name, log level, vector of std::shared sink pointers and formatter
 // Upon each log write the logger:
 // 1. Checks if its log level is enough to log the message

include/spdlog/sinks/null_sink.h

@@ -27,7 +27,7 @@ protected:
 
 };
 typedef null_sink<details::null_mutex> null_sink_st;
-typedef null_sink<std::mutex> null_sink_mt;
+typedef null_sink<details::null_mutex> null_sink_mt;
 
 }
 }