Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-10-02 03:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverted pull #111 - wchar support under windows - it pollutes global namespace with new defines

Browse Source
This commit is contained in:
gabime
2015-08-07 14:05:34 +03:00
parent 5afce16979
commit cadd181d8d
7 changed files with 64 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/spdlog/common.h
View File

@@ -36,15 +36,6 @@
#define SPDLOG_NOEXCEPT throw()
#endif
#if defined(WIN32) && defined(SPDLOG_USE_WCHAR)
typedef std::wstring tstring;
typedef wchar_t tchar;
#define S(s) L ## s
#else
#define S(s) s
typedef std::string tstring;
typedef char tchar;
#endif
namespace spdlog
{
@@ -58,8 +49,8 @@ class sink;
// Common types across the lib
using log_clock = std::chrono::system_clock;
using sink_ptr = std::shared_ptr < sinks::sink > ;
using sinks_init_list = std::initializer_list < sink_ptr > ;
using sink_ptr = std::shared_ptr < sinks::sink >;
using sinks_init_list = std::initializer_list < sink_ptr >;
using formatter_ptr = std::shared_ptr<spdlog::formatter>;
@@ -68,16 +59,16 @@ namespace level
{
typedef enum
{
trace = 0,
debug = 1,
info = 2,
notice = 3,
warn = 4,
err = 5,
trace = 0,
debug = 1,
info = 2,
notice = 3,
warn = 4,
err = 5,
critical = 6,
alert = 7,
emerg = 8,
off = 9
alert = 7,
emerg = 8,
off = 9
} level_enum;
static const char* level_names[] { "trace", "debug", "info", "notice", "warning", "error", "critical", "alert", "emerg", "off"};
@@ -122,4 +113,4 @@ private:
};
} //spdlog
} //spdlog