Use only SPDLOG_USE_WCHAR to control whether wchar_t is enabled.
This commit is contained in:
		
							parent
							
								
									787aa46693
								
							
						
					
					
						commit
						d905ad915f
					
				@ -36,10 +36,6 @@
 | 
			
		||||
#define SPDLOG_NOEXCEPT throw()
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if !defined(SPDLOG_NO_WCHAR) && defined(WIN32)
 | 
			
		||||
#define SPDLOG_USE_WCHAR
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(WIN32) && defined(SPDLOG_USE_WCHAR)
 | 
			
		||||
typedef std::wstring tstring;
 | 
			
		||||
typedef wchar_t tchar;
 | 
			
		||||
 | 
			
		||||
@ -75,6 +75,6 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
///////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
// Uncomment to disable usage of wchar_t for file names on Windows.
 | 
			
		||||
// #define SPDLOG_NO_WCHAR
 | 
			
		||||
// Uncomment to enable usage of wchar_t for file names on Windows.
 | 
			
		||||
// #define SPDLOG_USE_WCHAR
 | 
			
		||||
///////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
 | 
			
		||||
@ -7,7 +7,6 @@
 | 
			
		||||
#include <chrono>
 | 
			
		||||
#include <exception>
 | 
			
		||||
 | 
			
		||||
#define SPDLOG_NO_WCHAR
 | 
			
		||||
#include "catch.hpp"
 | 
			
		||||
#include "../include/spdlog/spdlog.h"
 | 
			
		||||
#include "../include/spdlog/sinks/null_sink.h"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user