mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-26 10:31:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed SPDLOG_WCHAR_SUPPORT macro

Browse Source
This commit is contained in:
gabime 2023-07-28 19:07:32 +03:00
parent 7c054b6dba
commit 5993e78aac
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -101,10 +101,8 @@ endif()
# misc tweakme options # misc tweakme options
if(WIN32) if(WIN32)
option(SPDLOG_WCHAR_SUPPORT "Support wchar api" OFF)
option(SPDLOG_WCHAR_FILENAMES "Support wchar filenames" OFF) option(SPDLOG_WCHAR_FILENAMES "Support wchar filenames" OFF)
else() else()
set(SPDLOG_WCHAR_SUPPORT OFF CACHE BOOL "non supported option" FORCE)
set(SPDLOG_WCHAR_FILENAMES OFF CACHE BOOL "non supported option" FORCE) set(SPDLOG_WCHAR_FILENAMES OFF CACHE BOOL "non supported option" FORCE)
endif() endif()

9
appveyor.yml
View File

@ -6,7 +6,6 @@ environment:
BUILD_TYPE: Debug BUILD_TYPE: Debug
BUILD_SHARED: 'OFF' BUILD_SHARED: 'OFF'
FATAL_ERRORS: 'OFF' FATAL_ERRORS: 'OFF'
WCHAR: 'ON'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'ON' BUILD_EXAMPLE: 'ON'
USE_STD_FORMAT: 'OFF' USE_STD_FORMAT: 'OFF'
@ -15,7 +14,6 @@ environment:
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'OFF' BUILD_SHARED: 'OFF'
FATAL_ERRORS: 'OFF' FATAL_ERRORS: 'OFF'
WCHAR: 'OFF'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'ON' BUILD_EXAMPLE: 'ON'
USE_STD_FORMAT: 'OFF' USE_STD_FORMAT: 'OFF'
@ -24,7 +22,6 @@ environment:
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'ON' BUILD_SHARED: 'ON'
FATAL_ERRORS: 'OFF' FATAL_ERRORS: 'OFF'
WCHAR: 'OFF'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'ON' BUILD_EXAMPLE: 'ON'
USE_STD_FORMAT: 'OFF' USE_STD_FORMAT: 'OFF'
@ -33,7 +30,6 @@ environment:
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'ON' BUILD_SHARED: 'ON'
FATAL_ERRORS: 'OFF' FATAL_ERRORS: 'OFF'
WCHAR: 'ON'
WCHAR_FILES: 'ON' WCHAR_FILES: 'ON'
BUILD_EXAMPLE: 'OFF' BUILD_EXAMPLE: 'OFF'
USE_STD_FORMAT: 'OFF' USE_STD_FORMAT: 'OFF'
@ -42,7 +38,6 @@ environment:
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'ON' BUILD_SHARED: 'ON'
FATAL_ERRORS: 'ON' FATAL_ERRORS: 'ON'
WCHAR: 'OFF'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'OFF' BUILD_EXAMPLE: 'OFF'
USE_STD_FORMAT: 'OFF' USE_STD_FORMAT: 'OFF'
@ -52,7 +47,6 @@ environment:
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'ON' BUILD_SHARED: 'ON'
FATAL_ERRORS: 'ON' FATAL_ERRORS: 'ON'
WCHAR: 'OFF'
WCHAR_FILES: 'OFF' WCHAR_FILES: 'OFF'
BUILD_EXAMPLE: 'OFF' BUILD_EXAMPLE: 'OFF'
USE_STD_FORMAT: 'ON' USE_STD_FORMAT: 'ON'
@ -62,7 +56,6 @@ environment:
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_SHARED: 'ON' BUILD_SHARED: 'ON'
FATAL_ERRORS: 'ON' FATAL_ERRORS: 'ON'
WCHAR: 'ON'
WCHAR_FILES: 'ON' WCHAR_FILES: 'ON'
BUILD_EXAMPLE: 'OFF' BUILD_EXAMPLE: 'OFF'
USE_STD_FORMAT: 'ON' USE_STD_FORMAT: 'ON'
@ -78,7 +71,7 @@ build_script:
set PATH=%PATH%;C:\Program Files\Git\usr\bin set PATH=%PATH%;C:\Program Files\Git\usr\bin
cmake -G %GENERATOR% -D CMAKE_BUILD_TYPE=%BUILD_TYPE% -D BUILD_SHARED_LIBS=%BUILD_SHARED% -D SPDLOG_WCHAR_SUPPORT=%WCHAR% -D SPDLOG_WCHAR_FILENAMES=%WCHAR_FILES% -D SPDLOG_BUILD_EXAMPLE=%BUILD_EXAMPLE% -D SPDLOG_BUILD_EXAMPLE_HO=%BUILD_EXAMPLE% -D SPDLOG_BUILD_TESTS=ON -D SPDLOG_BUILD_TESTS_HO=OFF -D SPDLOG_BUILD_WARNINGS=%FATAL_ERRORS% -D SPDLOG_USE_STD_FORMAT=%USE_STD_FORMAT% -D CMAKE_CXX_STANDARD=%CXX_STANDARD% .. cmake -G %GENERATOR% -D CMAKE_BUILD_TYPE=%BUILD_TYPE% -D BUILD_SHARED_LIBS=%BUILD_SHARED% -D SPDLOG_WCHAR_FILENAMES=%WCHAR_FILES% -D SPDLOG_BUILD_EXAMPLE=%BUILD_EXAMPLE% -D SPDLOG_BUILD_EXAMPLE_HO=%BUILD_EXAMPLE% -D SPDLOG_BUILD_TESTS=ON -D SPDLOG_BUILD_TESTS_HO=OFF -D SPDLOG_BUILD_WARNINGS=%FATAL_ERRORS% -D SPDLOG_USE_STD_FORMAT=%USE_STD_FORMAT% -D CMAKE_CXX_STANDARD=%CXX_STANDARD% ..
cmake --build . --config %BUILD_TYPE% cmake --build . --config %BUILD_TYPE%

2
include/spdlog/logger.h
View File

@ -19,6 +19,7 @@
#include <spdlog/sinks/sink.h> #include <spdlog/sinks/sink.h>
#include <vector> #include <vector>
#include <cassert>
#ifndef SPDLOG_NO_EXCEPTIONS #ifndef SPDLOG_NO_EXCEPTIONS
# define SPDLOG_LOGGER_CATCH(location) \ # define SPDLOG_LOGGER_CATCH(location) \
@ -266,6 +267,7 @@ protected:
// log the given message (if the given log level is high enough) // log the given message (if the given log level is high enough)
virtual void sink_it_(const details::log_msg &msg) virtual void sink_it_(const details::log_msg &msg)
{ {
assert (should_log(msg.level));
for (auto &sink : sinks_) for (auto &sink : sinks_)
{ {
if (sink->should_log(msg.level)) if (sink->should_log(msg.level))