From a184a905ec7b5b2a79aa832eb58fdbd77266f610 Mon Sep 17 00:00:00 2001 From: Wenqing Wang <wenqing.wang@ufz.de> Date: Fri, 29 May 2020 13:26:55 +0200 Subject: [PATCH] [MeshLib] Resolved the namespace conflict with VTK --- MeshLib/Elements/TemplateElement-impl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MeshLib/Elements/TemplateElement-impl.h b/MeshLib/Elements/TemplateElement-impl.h index 0e87b63befc..40cb8dd4fdb 100644 --- a/MeshLib/Elements/TemplateElement-impl.h +++ b/MeshLib/Elements/TemplateElement-impl.h @@ -51,6 +51,7 @@ TemplateElement<ELEMENT_RULE>::TemplateElement(const TemplateElement &e) this->_content = e.getContent(); } + namespace details { @@ -75,7 +76,8 @@ isEdge(unsigned const (&/*edge_nodes*/)[1], unsigned /*idx1*/, unsigned /*idx2*/ return false; } -} // namespace details +} // namespace details + template <class ELEMENT_RULE> bool TemplateElement<ELEMENT_RULE>::isEdge(unsigned idx1, unsigned idx2) const -- GitLab