Fix code to support VS2013
This commit is contained in:
		@@ -48,7 +48,7 @@ void testlog(int threads)
 | 
			
		||||
int main(int argc, char* argv[])
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
	if(argc || argv){};
 | 
			
		||||
    if(argc || argv) {};
 | 
			
		||||
    using namespace std::chrono;
 | 
			
		||||
    using namespace c11log;
 | 
			
		||||
    using namespace utils;
 | 
			
		||||
 
 | 
			
		||||
@@ -58,8 +58,7 @@ public:
 | 
			
		||||
    // If the queue is full, block the calling thread until there is room.
 | 
			
		||||
    template<typename TT>
 | 
			
		||||
    void push(TT&& item) {
 | 
			
		||||
        constexpr std::chrono::hours one_hour(1);
 | 
			
		||||
        while (!push(std::forward<TT>(item), one_hour));
 | 
			
		||||
        while (!push(std::forward<TT>(item), std::chrono::hours(1)));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Pop a copy of the front item in the queue into the given item ref.
 | 
			
		||||
@@ -86,8 +85,7 @@ public:
 | 
			
		||||
    // Pop a copy of the front item in the queue into the given item ref.
 | 
			
		||||
    // If the queue is empty, block the calling thread util there is item to pop.
 | 
			
		||||
    void pop(T& item) {
 | 
			
		||||
        constexpr std::chrono::hours one_hour(1);
 | 
			
		||||
        while (!pop(item, one_hour));
 | 
			
		||||
        while (!pop(item, std::chrono::hours(1)));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Clear the queue
 | 
			
		||||
 
 | 
			
		||||
@@ -18,6 +18,7 @@ public:
 | 
			
		||||
 | 
			
		||||
    const std::string& str_ref() const {
 | 
			
		||||
        return _str;
 | 
			
		||||
        std::ostringstream oss;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void clear() {
 | 
			
		||||
@@ -47,7 +48,9 @@ class fast_oss:public std::ostream {
 | 
			
		||||
public:
 | 
			
		||||
    fast_oss():std::ostream(&_dev) {}
 | 
			
		||||
    ~fast_oss() = default;
 | 
			
		||||
    fast_oss(const fast_oss& other):std::basic_ios<char>(), std::ostream(),_dev(other._dev) {}
 | 
			
		||||
 | 
			
		||||
    fast_oss(const fast_oss& other) :std::ostream(&_dev), _dev(other._dev) {
 | 
			
		||||
    }
 | 
			
		||||
    fast_oss& operator=(const fast_oss& other) {
 | 
			
		||||
        if(&other != this)
 | 
			
		||||
            _dev = other._dev;
 | 
			
		||||
 
 | 
			
		||||
@@ -41,8 +41,7 @@ inline bool operator==(const std::tm& tm1, const std::tm& tm2)
 | 
			
		||||
            tm1.tm_mday == tm2.tm_mday &&
 | 
			
		||||
            tm1.tm_mon == tm2.tm_mon &&
 | 
			
		||||
            tm1.tm_year == tm2.tm_year &&
 | 
			
		||||
		   tm1.tm_isdst == tm2.tm_isdst &&
 | 
			
		||||
		   tm1.tm_gmtoff == tm2.tm_gmtoff);
 | 
			
		||||
            tm1.tm_isdst == tm2.tm_isdst);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,7 @@
 | 
			
		||||
#include <functional>
 | 
			
		||||
#include <sstream>
 | 
			
		||||
#include <iomanip>
 | 
			
		||||
#include <thread>
 | 
			
		||||
 | 
			
		||||
#include "common_types.h"
 | 
			
		||||
#include "details/os.h"
 | 
			
		||||
@@ -43,8 +44,9 @@ 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];
 | 
			
		||||
 | 
			
		||||
    __declspec(thread) static std::tm last_tm = { 0, 0, 0, 0, 0, 0, 0, 0, 0};
 | 
			
		||||
    __declspec(thread) static char last_time_str[64];
 | 
			
		||||
    auto tm_now = details::os::localtime(log_clock::to_time_t(tp));
 | 
			
		||||
 | 
			
		||||
    if(last_tm != tm_now)
 | 
			
		||||
 
 | 
			
		||||
@@ -30,8 +30,10 @@ public:
 | 
			
		||||
        _logger_name(name),
 | 
			
		||||
        _formatter(new formatters::default_formatter()),
 | 
			
		||||
        _sinks(),
 | 
			
		||||
        _mutex(),
 | 
			
		||||
        _atomic_level(level::INFO) {
 | 
			
		||||
        _mutex()
 | 
			
		||||
    {
 | 
			
		||||
        //Seems that vs2013 doesnt support atomic member initialization in ctor, so its done here
 | 
			
		||||
        _atomic_level = level::INFO;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    ~logger() = default;
 | 
			
		||||
 
 | 
			
		||||
@@ -61,7 +61,7 @@ inline void c11log::sinks::async_sink::_sink_it(const std::string& msg)
 | 
			
		||||
 | 
			
		||||
inline void c11log::sinks::async_sink::_thread_loop()
 | 
			
		||||
{
 | 
			
		||||
    constexpr auto pop_timeout = std::chrono::seconds(1);
 | 
			
		||||
    static std::chrono::seconds  pop_timeout { 1 };
 | 
			
		||||
    std::string msg;
 | 
			
		||||
 | 
			
		||||
    while (_active) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user