Use only SPDLOG_USE_WCHAR to control whether wchar_t is enabled.

This commit is contained in:
Ilya Kulakov 2015-07-26 15:18:08 -04:00
parent 787aa46693
commit d905ad915f
3 changed files with 2 additions and 7 deletions

View File

@ -36,10 +36,6 @@
#define SPDLOG_NOEXCEPT throw() #define SPDLOG_NOEXCEPT throw()
#endif #endif
#if !defined(SPDLOG_NO_WCHAR) && defined(WIN32)
#define SPDLOG_USE_WCHAR
#endif
#if defined(WIN32) && defined(SPDLOG_USE_WCHAR) #if defined(WIN32) && defined(SPDLOG_USE_WCHAR)
typedef std::wstring tstring; typedef std::wstring tstring;
typedef wchar_t tchar; typedef wchar_t tchar;

View File

@ -75,6 +75,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Uncomment to disable usage of wchar_t for file names on Windows. // Uncomment to enable usage of wchar_t for file names on Windows.
// #define SPDLOG_NO_WCHAR // #define SPDLOG_USE_WCHAR
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

View File

@ -7,7 +7,6 @@
#include <chrono> #include <chrono>
#include <exception> #include <exception>
#define SPDLOG_NO_WCHAR
#include "catch.hpp" #include "catch.hpp"
#include "../include/spdlog/spdlog.h" #include "../include/spdlog/spdlog.h"
#include "../include/spdlog/sinks/null_sink.h" #include "../include/spdlog/sinks/null_sink.h"