From 1541e2fdda91dbc5551790ba71c2c1da8205ad28 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 01:06:54 +0300 Subject: [PATCH 01/12] Update basic_file_sink.cpp --- src/sinks/basic_file_sink.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sinks/basic_file_sink.cpp b/src/sinks/basic_file_sink.cpp index 0b570053..ead8ae00 100644 --- a/src/sinks/basic_file_sink.cpp +++ b/src/sinks/basic_file_sink.cpp @@ -4,6 +4,8 @@ #include #include #include +#include +#include namespace spdlog { namespace sinks { From eea29ce6ac45928efdf8ced7a598c35dced62b5c Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 02:16:46 +0300 Subject: [PATCH 02/12] Update base_sink.cpp --- src/sinks/base_sink.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sinks/base_sink.cpp b/src/sinks/base_sink.cpp index 8fd7d11b..1e1eaab5 100644 --- a/src/sinks/base_sink.cpp +++ b/src/sinks/base_sink.cpp @@ -59,5 +59,5 @@ void spdlog::sinks::base_sink::set_formatter_(std::unique_ptr; -template class SPDLOG_API spdlog::sinks::base_sink; +template class spdlog::sinks::base_sink; +template class spdlog::sinks::base_sink; From 04e921add4daf3a623dabb81e4d20051c196984f Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 03:06:02 +0300 Subject: [PATCH 03/12] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 18a4639c..e3b184be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ environment: - GENERATOR: '"Visual Studio 15 2017 Win64"' BUILD_TYPE: Release WCHAR: 'OFF' - BUILD_SHARED: 'ON' + BUILD_SHARED: 'OFF' build_script: - cmd: >- set @@ -40,7 +40,7 @@ build_script: set PATH=%PATH%;C:\Program Files\Git\usr\bin - cmake .. -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DSPDLOG_WCHAR_SUPPORT=%WCHAR% -DSPDLOG_BUILD_SHARED=%BUILD_SHARED% -DSPDLOG_BUILD_EXAMPLE=ON -DSPDLOG_BUILD_EXAMPLE_HO=ON -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_TESTS_HO=OFF -DSPDLOG_ENABLE_WARNINGS=ON + cmake .. -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DSPDLOG_WCHAR_SUPPORT=%WCHAR% -DSPDLOG_BUILD_SHARED=%BUILD_SHARED% -DSPDLOG_BUILD_EXAMPLE=ON -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_WARNINGS=ON cmake --build . --config %BUILD_TYPE% From c8d26d9b8d565bbbb4cce7de3837b06f7073f526 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 03:07:45 +0300 Subject: [PATCH 04/12] Update base_sink.cpp --- src/sinks/base_sink.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sinks/base_sink.cpp b/src/sinks/base_sink.cpp index 1e1eaab5..8fd7d11b 100644 --- a/src/sinks/base_sink.cpp +++ b/src/sinks/base_sink.cpp @@ -59,5 +59,5 @@ void spdlog::sinks::base_sink::set_formatter_(std::unique_ptr; -template class spdlog::sinks::base_sink; +template class SPDLOG_API spdlog::sinks::base_sink; +template class SPDLOG_API spdlog::sinks::base_sink; From 841537be9d8259659408a3ad84bdf029921ef0c2 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 14:56:08 +0300 Subject: [PATCH 05/12] Fixed dll build --- appveyor.yml | 2 +- include/spdlog/fmt/fmt.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e3b184be..a7283bb1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ environment: - GENERATOR: '"Visual Studio 15 2017 Win64"' BUILD_TYPE: Release WCHAR: 'OFF' - BUILD_SHARED: 'OFF' + BUILD_SHARED: 'ON' build_script: - cmd: >- set diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index 0687e441..9f308ad0 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -11,9 +11,6 @@ // #if !defined(SPDLOG_FMT_EXTERNAL) -#if !defined(FMT_HEADER_ONLY) -#define FMT_HEADER_ONLY -#endif #ifndef FMT_USE_WINDOWS_H #define FMT_USE_WINDOWS_H 0 #endif From 728f50bc6e4af2ac21679b0494ebe45c1c29e7ce Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 16:41:21 +0300 Subject: [PATCH 06/12] Supress msvc template instantiation warnings under dll build --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15e45395..017f1e77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,7 @@ if (SPDLOG_BUILD_SHARED) add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS}) target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB) if (WIN32) - target_compile_options(spdlog PUBLIC /wd4251 /wd4275) + target_compile_options(spdlog PUBLIC /wd4251 /wd4275 /wd4661) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY) endif () if (NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO) From 58be7ce86c56b349739e02b10c576b074b6ba468 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 17:01:29 +0300 Subject: [PATCH 07/12] Update .travis.yml --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e55a7ced..482fadd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,38 +45,38 @@ addons: &clang10 matrix: include: # Test gcc-4.8: C++11, Build=Debug/Release - - env: GCC_VERSION=4.8 BUILD_TYPE=Debug CPP=11 + - env: GCC_VERSION=4.8 BUILD_TYPE=Debug CPP=14 os: linux addons: *gcc48 - - env: GCC_VERSION=4.8 BUILD_TYPE=Release CPP=11 + - env: GCC_VERSION=4.8 BUILD_TYPE=Release CPP=14 os: linux addons: *gcc48 - - env: GCC_VERSION=7 BUILD_TYPE=Release CPP=11 + - env: GCC_VERSION=7 BUILD_TYPE=Release CPP=14 os: linux addons: *gcc7 # Test clang-3.5: C++11, Build=Debug/Release - - env: CLANG_VERSION=3.5 BUILD_TYPE=Debug CPP=11 + - env: CLANG_VERSION=3.5 BUILD_TYPE=Debug CPP=14 os: linux addons: *clang35 - - env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=11 + - env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=14 os: linux addons: *clang35 # osx - - env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off + - env: BUILD_TYPE=Release CPP=14 ASAN=Off TSAN=Off os: osx # Test clang-10.0: C++11, Build=Debug/Release - - env: CLANG_VERSION=10 BUILD_TYPE=Debug CPP=11 + - env: CLANG_VERSION=10 BUILD_TYPE=Debug CPP=14 os: linux dist: bionic addons: *clang10 - - env: CLANG_VERSION=10 BUILD_TYPE=Release CPP=11 ASAN=On + - env: CLANG_VERSION=10 BUILD_TYPE=Release CPP=14 ASAN=On os: linux dist: bionic addons: *clang10 From 86ebeaa4ce6aeb3e6a8eb610b1d1794f327346ff Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 17:10:34 +0300 Subject: [PATCH 08/12] Update stdout_color_sinks.cpp --- src/sinks/stdout_color_sinks.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sinks/stdout_color_sinks.cpp b/src/sinks/stdout_color_sinks.cpp index 9c63e834..2165db2e 100644 --- a/src/sinks/stdout_color_sinks.cpp +++ b/src/sinks/stdout_color_sinks.cpp @@ -33,6 +33,8 @@ std::shared_ptr stderr_color_st(const std::string &logger_name, color_mo return Factory::template create(logger_name, mode); } +} // namespace spdlog + // template instantiations template SPDLOG_API std::shared_ptr spdlog::stdout_color_mt( const std::string &logger_name, color_mode mode); @@ -51,5 +53,3 @@ template SPDLOG_API std::shared_ptr spdlog::stderr_color_mt spdlog::stderr_color_st( const std::string &logger_name, color_mode mode); - -} // namespace spdlog \ No newline at end of file From a5ce1ae41193e2f83cc926a1d30a6512c8e70cc7 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 17:39:01 +0300 Subject: [PATCH 09/12] Update .travis.yml --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 482fadd6..9b123aa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,11 @@ sudo: required language: cpp -# gcc 4.8 -addons: &gcc48 +# gcc 4.9 +addons: &gcc49 apt: packages: - - g++-4.8 + - g++-4.9 sources: - ubuntu-toolchain-r-test @@ -44,14 +44,14 @@ addons: &clang10 matrix: include: - # Test gcc-4.8: C++11, Build=Debug/Release - - env: GCC_VERSION=4.8 BUILD_TYPE=Debug CPP=14 + # Test gcc-4.9: C++14, Build=Debug/Release + - env: GCC_VERSION=4.9 BUILD_TYPE=Debug CPP=14 os: linux - addons: *gcc48 + addons: *gcc49 - - env: GCC_VERSION=4.8 BUILD_TYPE=Release CPP=14 + - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=14 os: linux - addons: *gcc48 + addons: *gcc49 - env: GCC_VERSION=7 BUILD_TYPE=Release CPP=14 os: linux @@ -101,7 +101,7 @@ script: -DCMAKE_CXX_STANDARD=$CPP \ -DSPDLOG_BUILD_EXAMPLE=ON \ -DSPDLOG_BUILD_EXAMPLE_HO=ON \ - -DSPDLOG_ENABLE_WARNINGS=ON \ + -DSPDLOG_BUILD_WARNINGS=ON \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_BUILD_TESTS=ON \ -DSPDLOG_BUILD_TESTS_HO=OFf \ From a95bf15e9abdee27ab5ca6b97602fbf45e64fb00 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 17:39:30 +0300 Subject: [PATCH 10/12] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b123aa8..7f4a3c7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,11 +100,9 @@ script: -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_CXX_STANDARD=$CPP \ -DSPDLOG_BUILD_EXAMPLE=ON \ - -DSPDLOG_BUILD_EXAMPLE_HO=ON \ -DSPDLOG_BUILD_WARNINGS=ON \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_BUILD_TESTS=ON \ - -DSPDLOG_BUILD_TESTS_HO=OFf \ -DSPDLOG_SANITIZE_ADDRESS=$ASAN - make VERBOSE=1 -j2 From 4be60c180a93a9246222d48b0a8cdb4441011942 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 17:46:10 +0300 Subject: [PATCH 11/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b18d7096..c8546af5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # spdlog -Very fast, header-only/compiled, C++ logging library. [![Build Status](https://travis-ci.org/gabime/spdlog.svg?branch=v1.x)](https://travis-ci.org/gabime/spdlog)  [![Build status](https://ci.appveyor.com/api/projects/status/d2jnxclg20vd0o50?svg=true)](https://ci.appveyor.com/project/gabime/spdlog) [![Release](https://img.shields.io/github/release/gabime/spdlog.svg)](https://github.com/gabime/spdlog/releases/latest) +Very fast, header-only/compiled, C++ logging library. [![Build Status](https://travis-ci.org/gabime/spdlog.svg?branch=v2.x)](https://travis-ci.org/gabime/spdlog)  [![Build status](https://ci.appveyor.com/api/projects/status/d2jnxclg20vd0o50?svg=true)](https://ci.appveyor.com/project/gabime/spdlog) [![Release](https://img.shields.io/github/release/gabime/spdlog.svg)](https://github.com/gabime/spdlog/releases/latest) ## Install #### Header only version From 5882e9acfe286c32ffc4372d409a392553f21239 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Mon, 8 Jun 2020 17:51:13 +0300 Subject: [PATCH 12/12] Update .travis.yml --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f4a3c7f..5bd9b6eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,11 +57,7 @@ matrix: os: linux addons: *gcc7 - # Test clang-3.5: C++11, Build=Debug/Release - - env: CLANG_VERSION=3.5 BUILD_TYPE=Debug CPP=14 - os: linux - addons: *clang35 - + # Test clang-3.5: C++11, Build=Release - env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=14 os: linux addons: *clang35