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.

Sign up for GitHub

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

Jump to bottom

Export assert_fail with FMT_API. This fixes dll build. #1446

Merged
merged 2 commits into from
Dec 3, 2019
Merged

Export assert_fail with FMT_API. This fixes dll build. #1446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d3260
Export assert_fail with FMT_API. This fixes dll build.
egorpugin Dec 3, 2019
5437277
Remove unneeded FMT_API.
egorpugin Dec 3, 2019
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: 1 addition & 1 deletion include/fmt/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ namespace internal {
// A workaround for gcc 4.8 to make void_t work in a SFINAE context.
template <typename... Ts> struct void_t_impl { using type = void; };

void assert_fail(const char* file, int line, const char* message);
FMT_API void assert_fail(const char* file, int line, const char* message);

#ifndef FMT_ASSERT
# ifdef NDEBUG
Expand Down
2 changes: 1 addition & 1 deletion include/fmt/format-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ inline fmt::internal::null<> strerror_s(char*, std::size_t, ...) { return {}; }
FMT_BEGIN_NAMESPACE
namespace internal {

FMT_FUNC void assert_fail(const char* file, int line, const char* message) {
FMT_API FMT_FUNC void assert_fail(const char* file, int line, const char* message) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think FMT_API is not needed here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, maybe. First, I thought header goes to users, but it seems it is fmt internal stuff?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, tested, works without it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's for the opt-in header-only mode and effectively an internal header.

print(stderr, "{}:{}: assertion failed: {}", file, line, message);
std::abort();
}
Expand Down