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

Only enable exceptions for builds with ZeroTier #6824

Merged
merged 2 commits into from
Nov 26, 2023
Merged

Only enable exceptions for builds with ZeroTier #6824

merged 2 commits into from
Nov 26, 2023

Conversation

glebm
Copy link
Collaborator

@glebm glebm commented Nov 19, 2023 •
edited
Loading

Follow-up to #6602

@AJenbo
Copy link
Member

AJenbo commented Nov 19, 2023 •
edited
Loading

Apple:

Source/dvlnet/base_protocol.h:277:2: error: cannot use 'try' with exceptions disabled

@StephenCWills
Copy link
Member

StephenCWills commented Nov 19, 2023 •
edited
Loading

The include on abstract_net.cpp:5 should probably be inside the #ifndef DISABLE_ZERO_TIER guard. We could also remove the try-catch in base_protocol.h because it appears to have been placed mainly in order to catch protocol_exception and frame_queue_exception. I forgot about it in my last PR.

@glebm glebm merged commit e5c7f0f into master Nov 26, 2023
23 checks passed
@glebm glebm deleted the zt-exceptions branch November 26, 2023 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StephenCWills StephenCWills StephenCWills approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@glebm @AJenbo @StephenCWills