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

move includes around to avoid boost L conflict #6542

Merged
merged 1 commit into from May 1, 2018

Conversation

Projects
None yet
2 participants
@Habbie
Member

Habbie commented Apr 30, 2018

Short description

This avoids errors like

/usr/local/include/boost/function_types/components.hpp:139:35: error: expected a qualified name after 'typename'
    template<typename T, typename L>
                                  ^
./dns.hh:228:11: note: expanded from macro 'L'
#define L theL()

This is an alternative to #6516. It does not preclude later merging of #6516.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled and tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
  • checked that this code was merged to master

@Habbie Habbie added this to the auth-4.1.2 milestone Apr 30, 2018

@pieterlexis pieterlexis merged commit 05f7039 into PowerDNS:rel/auth-4.1.x May 1, 2018

4 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
lgtm analysis: C/C++ No alert changes
Details
lgtm analysis: JavaScript No alert changes
Details
lgtm analysis: Python No alert changes
Details

@Habbie Habbie deleted the Habbie:auth-4.1.x-boost-L branch May 9, 2018

@Habbie Habbie referenced this pull request May 10, 2018

Merged

reorder includes to avoid Boost L conflict #6595

2 of 8 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment