forked from conda-forge/fmt-feedstock
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
as in fmtlib/fmt#2696 fixes conda-forge#27
- Loading branch information
Showing
2 changed files
with
34 additions
and
1 deletion.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
recipe/0001-Restore-FMT_API-on-error_handler-on_error.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From 5a05cb93f34bb1bf8d7084b5adede29251c878d6 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Julian=20R=C3=BCth?= <[email protected]> | ||
Date: Tue, 4 Jan 2022 00:37:58 -0600 | ||
Subject: [PATCH] Restore FMT_API on error_handler::on_error() | ||
|
||
this fixes a breaking ABI change that was introduce in the upgrade from | ||
8.0.1 to 8.1.0. | ||
|
||
Fixes #2695. | ||
--- | ||
include/fmt/core.h | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/include/fmt/core.h b/include/fmt/core.h | ||
index c946e12a..bdf51a4a 100644 | ||
--- a/include/fmt/core.h | ||
+++ b/include/fmt/core.h | ||
@@ -601,7 +601,8 @@ struct error_handler { | ||
constexpr error_handler(const error_handler&) = default; | ||
|
||
// This function is intentionally not constexpr to give a compile-time error. | ||
- void on_error(const char* message) { throw_format_error(message); } | ||
+ // This function is marked as FMT_API for backwards compatibility, see #2695. | ||
+ FMT_NORETURN FMT_API void on_error(const char* message) { throw_format_error(message); } | ||
}; | ||
FMT_END_DETAIL_NAMESPACE | ||
|
||
-- | ||
2.34.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters