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

dnsdist: Fix building with boost < 1.56 #12177

Merged
merged 1 commit into from
Nov 10, 2022

Conversation

rgacogne
Copy link
Member

@rgacogne rgacogne commented Nov 8, 2022

Short description

boost::optional::value_or() has been introduced in 1.56 and we only require 1.53, so stop using it.

Hopefully fixes the master part of #12142.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)

boost::optional::value_or() has been introduced in 1.56
and we only require 1.53, so stop using it.
@Habbie
Copy link
Member

Habbie commented Nov 10, 2022

I see your portable construct, and I like it, but I also note we use get_value_or in other places. However, that one has been deprecated in Boost, so we shouldn't switch to that.

#12183 backports the part of this PR that applies, and adds another fix in a place that master apparently does not have any more.

@Habbie
Copy link
Member

Habbie commented Nov 10, 2022

Hopefully fixes the master part of #12142.

There are at least two other problems on master for amazon-2 - one being the specfile now pulling in Boost 1.69 which doesn't work there, and one being the noncopyable include that somebody else also noticed. I hope to fix those two things soon.

@rgacogne
Copy link
Member Author

I see your portable construct, and I like it, but I also note we use get_value_or in other places. However, that one has been deprecated in Boost, so we shouldn't switch to that.

I went for the minimal fix in this PR but I agree we should also stop using get_value_or as it might get removed one day or another. I'll open an issue for that.

@rgacogne rgacogne merged commit 23fa00d into PowerDNS:master Nov 10, 2022
@rgacogne rgacogne deleted the ddist-fix-value-or-boost branch November 10, 2022 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants