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

add identity for variant #4090

Merged
merged 1 commit into from
Dec 10, 2023
Merged

add identity for variant #4090

merged 1 commit into from
Dec 10, 2023

Conversation

myk002
Copy link
Member

@myk002 myk002 commented Dec 10, 2023

I plan to merge this expediently to unbreak the build, but post-merge review would be welcome

@myk002 myk002 merged commit 7534d32 into DFHack:develop Dec 10, 2023
12 checks passed
@myk002 myk002 deleted the myk_variant branch December 10, 2023 11:21
@@ -49,7 +49,9 @@ namespace df {
STL_OPAQUE_IDENTITY_TRAITS(mutex);
STL_OPAQUE_IDENTITY_TRAITS(future<void>);
STL_OPAQUE_IDENTITY_TRAITS(function<void()>);
STL_OPAQUE_IDENTITY_TRAITS(optional<std::function<void()> >);
STL_OPAQUE_IDENTITY_TRAITS(optional<void_function>);
OPAQUE_IDENTITY_TRAITS_NAME(std::variant<std::string COMMA void_function>,
Copy link
Member

@ab9rf ab9rf Dec 10, 2023

Choose a reason for hiding this comment

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

there's a betetr way to do this using __VA_ARGS__. i have it in a local test branch, will dig out and PR expeditiously

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks. I was pretty unhappy with how this looked

Copy link
Member

@ab9rf ab9rf Dec 11, 2023

Choose a reason for hiding this comment

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

might want to cherry-pick bef0cde, which is on my 5012-testing-1 branch (feel free to omit the library/xml branch change)

Copy link
Member

Choose a reason for hiding this comment

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

see #4092

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants