Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libassert: Bump to 2.1.3 #26243

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions recipes/libassert/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2.1.3":
folder: v2
"2.1.2":
folder: v2
"2.1.1":
Expand Down
8 changes: 8 additions & 0 deletions recipes/libassert/v2/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2.1.3":
url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.3.tar.gz"
sha256: "79ababb220d53ba763e3a05557e024a037b611ff94c12dd7f6a4d53fa51b1161"
"2.1.2":
url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.2.tar.gz"
sha256: "a7220ca354270deca08a7a162b93523c738ba3c8037a4df1a46ababfdc664196"
Expand All @@ -18,6 +21,11 @@ sources:
url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.0.0.tar.gz"
sha256: "d4b2da2179a94637b34d18813a814531a1eceb0ddc6dd6db6098050dd638f4a1"
patches:
"2.1.3":
- patch_file: "patches/2.1.3/0001-msvc-noreturn.patch"
patch_type: "portability"
patch_source: todo
patch_description: "todo"
"2.1.0":
- patch_file: "patches/2.1.0/0001-msvc-ice.patch"
patch_type: "portability"
Expand Down
13 changes: 13 additions & 0 deletions recipes/libassert/v2/patches/2.1.3/0001-msvc-noreturn.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/include/libassert/assert.hpp b/include/libassert/assert.hpp
index 53ba850..9c68910 100644
--- a/include/libassert/assert.hpp
+++ b/include/libassert/assert.hpp
@@ -169,7 +169,7 @@ namespace libassert {

struct assertion_info;

- LIBASSERT_EXPORT [[noreturn]] void default_failure_handler(const assertion_info& info);
+ [[noreturn]] LIBASSERT_EXPORT void default_failure_handler(const assertion_info& info);

LIBASSERT_EXPORT void set_failure_handler(void (*handler)(const assertion_info&));