Use only SPDLOG_USE_WCHAR to control whether wchar_t is enabled.

10 years ago · d905ad915f
parent 787aa46693
commit d905ad915f
3 changed files with 2 additions and 7 deletions
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@ -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;
--- a/include/spdlog/tweakme.h
+++ b/include/spdlog/tweakme.h
@ -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
 ///////////////////////////////////////////////////////////////////////////////
--- a/tests/includes.h
+++ b/tests/includes.h
@ -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"