vs2013 support
This commit is contained in:
		@@ -5,6 +5,7 @@
 | 
			
		||||
#include <functional>
 | 
			
		||||
#include <sstream>
 | 
			
		||||
#include <iomanip>
 | 
			
		||||
#include <thread>
 | 
			
		||||
 | 
			
		||||
#include "common_types.h"
 | 
			
		||||
#include "details/os.h"
 | 
			
		||||
@@ -43,20 +44,34 @@ private:
 | 
			
		||||
 | 
			
		||||
inline void c11log::formatters::default_formatter::_format_time(const log_clock::time_point& tp, std::ostream &dest)
 | 
			
		||||
{
 | 
			
		||||
	static thread_local std::tm last_tm = {0,0,0,0,0,0,0,0,0,0,0};
 | 
			
		||||
	static thread_local char last_time_str[64];
 | 
			
		||||
    auto tm_now = details::os::localtime(log_clock::to_time_t(tp));
 | 
			
		||||
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
    __declspec(thread) static std::tm last_tm = { 0, 0, 0, 0, 0, 0, 0, 0, 0};
 | 
			
		||||
    __declspec(thread) static char last_time_str[64];
 | 
			
		||||
#else
 | 
			
		||||
       thread_local static std::tm last_tm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 | 
			
		||||
       thread_local static char last_time_str[64];
 | 
			
		||||
#endif
 | 
			
		||||
    
 | 
			
		||||
    auto tm_now = details::os::localtime(log_clock::to_time_t(tp));
 | 
			
		||||
	using namespace c11log::details::os;
 | 
			
		||||
    if(last_tm != tm_now)
 | 
			
		||||
    {				
 | 
			
		||||
		sprintf(last_time_str, "[%d-%02d-%02d %02d:%02d:%02d]",
 | 
			
		||||
    {
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
		::sprintf_s
 | 
			
		||||
#else		
 | 
			
		||||
		::snprintf
 | 
			
		||||
#endif
 | 
			
		||||
			(last_time_str, sizeof(last_time_str), "[%d-%02d-%02d %02d:%02d:%02d]",
 | 
			
		||||
                tm_now.tm_year + 1900,
 | 
			
		||||
                tm_now.tm_mon + 1,
 | 
			
		||||
                tm_now.tm_mday,
 | 
			
		||||
                tm_now.tm_hour,
 | 
			
		||||
                tm_now.tm_min,
 | 
			
		||||
                tm_now.tm_sec);
 | 
			
		||||
       	 last_tm = tm_now;			
 | 
			
		||||
	}			
 | 
			
		||||
	dest << last_time_str;	
 | 
			
		||||
        last_tm = tm_now;
 | 
			
		||||
 | 
			
		||||
		
 | 
			
		||||
    }
 | 
			
		||||
    dest << last_time_str;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user