Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x
This commit is contained in:
		@@ -20,7 +20,7 @@ protected:
 | 
				
			|||||||
    void flush_() override {}
 | 
					    void flush_() override {}
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using null_sink_mt = null_sink<std::mutex>;
 | 
					using null_sink_mt = null_sink<details::null_mutex>;
 | 
				
			||||||
using null_sink_st = null_sink<details::null_mutex>;
 | 
					using null_sink_st = null_sink<details::null_mutex>;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
} // namespace sinks
 | 
					} // namespace sinks
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "spdlog/sinks/base_sink.h"
 | 
					#include "spdlog/sinks/base_sink.h"
 | 
				
			||||||
#include "spdlog/details/file_helper.h"
 | 
					#include "spdlog/details/file_helper.h"
 | 
				
			||||||
 | 
					#include "spdlog/details/null_mutex.h"
 | 
				
			||||||
#include "spdlog/details/synchronous_factory.h"
 | 
					#include "spdlog/details/synchronous_factory.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <chrono>
 | 
					#include <chrono>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,6 +4,7 @@
 | 
				
			|||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "spdlog/sinks/base_sink.h"
 | 
					#include "spdlog/sinks/base_sink.h"
 | 
				
			||||||
 | 
					#include "spdlog/details/null_mutex.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <array>
 | 
					#include <array>
 | 
				
			||||||
#include <string>
 | 
					#include <string>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,6 +4,7 @@
 | 
				
			|||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "spdlog/sinks/base_sink.h"
 | 
					#include "spdlog/sinks/base_sink.h"
 | 
				
			||||||
 | 
					#include "spdlog/details/null_mutex.h"
 | 
				
			||||||
#include "spdlog/details/synchronous_factory.h"
 | 
					#include "spdlog/details/synchronous_factory.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <array>
 | 
					#include <array>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user