From 352589e5c3bcce53bcbc05da2f2611d614348f3d Mon Sep 17 00:00:00 2001 From: Viktor Kirilov Date: Wed, 16 Dec 2020 11:07:25 +0200 Subject: [PATCH] version 2.4.3 --- CHANGELOG.md | 7 +++++++ doctest/doctest.h | 6 ++++-- doctest/parts/doctest.cpp | 2 ++ doctest/parts/doctest_fwd.h | 4 ++-- examples/all_features/test_output/version.txt | 2 +- examples/all_features/test_output/version_xml.txt | 2 +- meson.build | 2 +- scripts/version.txt | 2 +- 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5231511cc..3363b57c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [2.4.3](https://github.com/onqtam/doctest/tree/2.4.3) (2020-12-16) +[Full Changelog](https://github.com/onqtam/doctest/compare/2.4.2...2.4.3) + +**Closed issues:** + +- 2.4.2: build fails [\#450](https://github.com/onqtam/doctest/issues/450) + ## [2.4.2](https://github.com/onqtam/doctest/tree/2.4.2) (2020-12-15) [Full Changelog](https://github.com/onqtam/doctest/compare/2.4.1...2.4.2) diff --git a/doctest/doctest.h b/doctest/doctest.h index cdcb50d85..ae9c4d410 100644 --- a/doctest/doctest.h +++ b/doctest/doctest.h @@ -48,8 +48,8 @@ #define DOCTEST_VERSION_MAJOR 2 #define DOCTEST_VERSION_MINOR 4 -#define DOCTEST_VERSION_PATCH 2 -#define DOCTEST_VERSION_STR "2.4.2" +#define DOCTEST_VERSION_PATCH 3 +#define DOCTEST_VERSION_STR "2.4.3" #define DOCTEST_VERSION \ (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH) @@ -3323,6 +3323,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") // depending on the current options this will remove the path of filenames const char* skipPathFromFilename(const char* file) { +#ifndef DOCTEST_CONFIG_DISABLE if(getContextOptions()->no_path_in_filenames) { auto back = std::strrchr(file, '\\'); auto forward = std::strrchr(file, '/'); @@ -3332,6 +3333,7 @@ const char* skipPathFromFilename(const char* file) { return forward + 1; } } +#endif // DOCTEST_CONFIG_DISABLE return file; } DOCTEST_CLANG_SUPPRESS_WARNING_POP diff --git a/doctest/parts/doctest.cpp b/doctest/parts/doctest.cpp index 67122e042..e032e523d 100644 --- a/doctest/parts/doctest.cpp +++ b/doctest/parts/doctest.cpp @@ -666,6 +666,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") // depending on the current options this will remove the path of filenames const char* skipPathFromFilename(const char* file) { +#ifndef DOCTEST_CONFIG_DISABLE if(getContextOptions()->no_path_in_filenames) { auto back = std::strrchr(file, '\\'); auto forward = std::strrchr(file, '/'); @@ -675,6 +676,7 @@ const char* skipPathFromFilename(const char* file) { return forward + 1; } } +#endif // DOCTEST_CONFIG_DISABLE return file; } DOCTEST_CLANG_SUPPRESS_WARNING_POP diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h index 4e5873152..d7956b910 100644 --- a/doctest/parts/doctest_fwd.h +++ b/doctest/parts/doctest_fwd.h @@ -45,8 +45,8 @@ #define DOCTEST_VERSION_MAJOR 2 #define DOCTEST_VERSION_MINOR 4 -#define DOCTEST_VERSION_PATCH 2 -#define DOCTEST_VERSION_STR "2.4.2" +#define DOCTEST_VERSION_PATCH 3 +#define DOCTEST_VERSION_STR "2.4.3" #define DOCTEST_VERSION \ (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH) diff --git a/examples/all_features/test_output/version.txt b/examples/all_features/test_output/version.txt index a32e18725..8d852acad 100644 --- a/examples/all_features/test_output/version.txt +++ b/examples/all_features/test_output/version.txt @@ -1 +1 @@ -[doctest] doctest version is "2.4.2" +[doctest] doctest version is "2.4.3" diff --git a/examples/all_features/test_output/version_xml.txt b/examples/all_features/test_output/version_xml.txt index 1a7dd6bbd..c14f4e8d2 100644 --- a/examples/all_features/test_output/version_xml.txt +++ b/examples/all_features/test_output/version_xml.txt @@ -1,4 +1,4 @@ - + diff --git a/meson.build b/meson.build index 2ec048f8b..26a2b6200 100644 --- a/meson.build +++ b/meson.build @@ -1,2 +1,2 @@ -project('doctest', ['cpp'], version: '2.4.2', meson_version:'>=0.50') +project('doctest', ['cpp'], version: '2.4.3', meson_version:'>=0.50') doctest_dep = declare_dependency(include_directories: include_directories('doctest')) diff --git a/scripts/version.txt b/scripts/version.txt index acdc3f1b0..6550da697 100644 --- a/scripts/version.txt +++ b/scripts/version.txt @@ -1 +1 @@ -2.4.2 \ No newline at end of file +2.4.3 \ No newline at end of file