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

Fix minor compiler errors (macro expansion, duplicate using) #1560

Merged
merged 3 commits into from Jun 24, 2021

Conversation

dermesser
Copy link
Contributor

for issue #1312 - probably doesn't fix it, but contributes to improvements.

@gonuke
Copy link
Member

gonuke commented Jun 22, 2021

Thank you @dermesser. Please add a news update by copying news/TEMPLATE.rst to a file with a name that matches your PR's purpose and fill in the appropriate sections. (We should clarify this as a requirement of a PR.)

dermesser added a commit to dermesser/cyclus that referenced this pull request Jun 23, 2021
@dermesser
Copy link
Contributor Author

I took the liberty and also fixed a second one-line issue (a duplicate using directive), that triggered compiler errors with at least some GCC versions for me. This way, the added news "article" is worth it :)

@dermesser dermesser changed the title Replace brittle macro with using directive Fix minor compiler errors (macro expansion, duplicate using) Jun 23, 2021
@dermesser
Copy link
Contributor Author

(We should clarify this as a requirement of a PR.)

I opened #1561 for this - I hope I understood you correctly :)

@dermesser dermesser closed this Jun 23, 2021
@dermesser dermesser reopened this Jun 23, 2021
dermesser added a commit to dermesser/cyclus that referenced this pull request Jun 23, 2021
Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

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

thanks @dermesser - this looks good to em

@gonuke gonuke merged commit aa09e74 into cyclus:master Jun 24, 2021
@bam241
Copy link
Member

bam241 commented Jun 24, 2021

btw we probably want to transpose that change in PyNE, as we changed the pyne.h

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants