From d905ad915fe5307dba7be61169db6b8f30eb082d Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Sun, 26 Jul 2015 15:18:08 -0400 Subject: [PATCH] Use only SPDLOG_USE_WCHAR to control whether wchar_t is enabled. --- include/spdlog/common.h | 4 ---- include/spdlog/tweakme.h | 4 ++-- tests/includes.h | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/spdlog/common.h b/include/spdlog/common.h index dd05f1b0..f86c02b9 100644 --- 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; diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h index 5bb33afd..7e0bb41b 100644 --- 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 /////////////////////////////////////////////////////////////////////////////// diff --git a/tests/includes.h b/tests/includes.h index 2c28f7d4..7cda161d 100644 --- a/tests/includes.h +++ b/tests/includes.h @@ -7,7 +7,6 @@ #include #include -#define SPDLOG_NO_WCHAR #include "catch.hpp" #include "../include/spdlog/spdlog.h" #include "../include/spdlog/sinks/null_sink.h"