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

Explicitly spell dealii::parallel in multiple places #9758

Merged
merged 1 commit into from Apr 3, 2020

Conversation

peterrum
Copy link
Member

No description provided.

Copy link
Member

@kronbichler kronbichler left a comment

Choose a reason for hiding this comment

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

While the change looks generally ok to me, I wonder which namespace was creating the conflict for you (because it makes argument lists quite long, especially in dof_handler_policy.cc) - is it internal::parallel::distributedGridRefinement or do we have many others?

@@ -3916,7 +3916,7 @@ class Triangulation : public Subscriptor

friend struct dealii::internal::TriaAccessorImplementation::Implementation;

friend class hp::DoFHandler<dim, spacedim>;
friend hp::DoFHandler<dim, spacedim>;
Copy link
Member

Choose a reason for hiding this comment

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

Do you need this change? It is not consistent with our regular friend declaration conventions.

Copy link
Member Author

Choose a reason for hiding this comment

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

This change was not wanted.

I wonder which namespace was creating the conflict for you

Yes, it is searching in dealii::internal::parallel. I guess I have included the files in an order which triggers this.

@peterrum peterrum force-pushed the parallel_namespace_problem branch 2 times, most recently from 6fb1b45 to b8b8745 Compare March 28, 2020 15:13
@kronbichler
Copy link
Member

/rebuild

@masterleinad masterleinad merged commit 3d170a2 into dealii:master Apr 3, 2020
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.

None yet

4 participants